Deukhoofd
/
Arbutils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Further fixes in the hope of fixing conan.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-07-12 13:36:20 +02:00
parent 03d1ff23e1
commit ab7504e79a
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -20,21 +20,19 @@ add_library(Arbutils ${LIBTYPE} ${SRC_FILES})
if (WINDOWS) if (WINDOWS)
MESSAGE(WARNING, "Using Windows Build.") MESSAGE(WARNING, "Using Windows Build.")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -Wa,-mbig-obj -pthread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -Wa,-mbig-obj -pthread")
if (STATICC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wc-static-runtime")
endif (STATICC)
set_target_properties(Arbutils PROPERTIES SUFFIX ".dll") set_target_properties(Arbutils PROPERTIES SUFFIX ".dll")
endif (WINDOWS) endif (WINDOWS)
if (STATICC) if (STATICC)
if (NOT WINDOWS)
target_link_libraries(Arbutils -static-libgcc -static-libstdc++) target_link_libraries(Arbutils -static-libgcc -static-libstdc++)
endif ()
endif (STATICC) endif (STATICC)
if (NOT DEFINED CONAN_EXPORTED) if (NOT DEFINED CONAN_EXPORTED)
file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp") file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp")
add_executable(ArbutilsTests ${TEST_FILES} extern/catch.hpp) add_executable(ArbutilsTests ${TEST_FILES} extern/catch.hpp)
if (WINDOWS)
set_target_properties(ArbutilsTests PROPERTIES SUFFIX ".exe")
endif ()
target_link_libraries(ArbutilsTests Arbutils) target_link_libraries(ArbutilsTests Arbutils)
endif () endif ()