From fa81bd59d61b2ee48f1ff506cab77d3814b8b635 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Fri, 27 Dec 2019 13:50:12 +0100 Subject: [PATCH] Dont include test executable when called from Conan --- CMakeLists.txt | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2eb3f51..750c3d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,9 +24,11 @@ add_library(CreatureLibLibrary SHARED ${LIBRARY_SRC_FILES}) file(GLOB_RECURSE BATTLING_SRC_FILES "src/Battling/*.cpp" "src/Battling/*.hpp") add_library(CreatureLibBattling SHARED ${BATTLING_SRC_FILES}) -# Create Test executable -file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp") -add_executable(CreatureLibTests ${TEST_FILES} extern/catch.hpp) +if (NOT DEFINED CONAN_EXPORTED) + # Create Test executable + file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp") + add_executable(CreatureLibTests ${TEST_FILES} extern/catch.hpp) +endif () # Link the core library to the individual other libraries target_link_libraries(CreatureLibLibrary CreatureLibCore) @@ -35,8 +37,10 @@ target_link_libraries(CreatureLibBattling CreatureLibCore) # Link the library data to the Battling library target_link_libraries(CreatureLibBattling CreatureLibLibrary) -target_link_libraries(CreatureLibTests CreatureLibLibrary) -target_link_libraries(CreatureLibTests CreatureLibBattling) +if (NOT DEFINED CONAN_EXPORTED) + target_link_libraries(CreatureLibTests CreatureLibLibrary) + target_link_libraries(CreatureLibTests CreatureLibBattling) +endif () if (WINDOWS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -Wa,-mbig-obj -Wl,-allow-multiple-definition") @@ -47,8 +51,10 @@ if (WINDOWS) target_link_libraries(CreatureLibTests -static -static-libgcc -static-libstdc++) endif (WINDOWS) -# Add a definition for the test library -target_compile_definitions(CreatureLibTests PRIVATE TESTS_BUILD) +if (NOT DEFINED CONAN_EXPORTED) + # Add a definition for the test library + target_compile_definitions(CreatureLibTests PRIVATE TESTS_BUILD) +endif () if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)