CMake: Do not add conan global compiler flags

+ Add conan-gtest compile definitions for the unit_tests target
This commit is contained in:
Luis Díaz Más
2018-11-05 17:10:54 +01:00
parent ea5ae1b94c
commit 244f00bf3a
2 changed files with 5 additions and 1 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
set(USING_CONAN ON)
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup(NO_OUTPUT_DIRS KEEP_RPATHS)
conan_basic_setup(NO_OUTPUT_DIRS KEEP_RPATHS TARGETS)
endif()
find_package(Threads REQUIRED)
+4
View File
@@ -41,3 +41,7 @@ target_compile_definitions(unit_tests
set_target_properties( unit_tests PROPERTIES
COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}
)
if (USING_CONAN)
target_compile_definitions(unit_tests PRIVATE ${CONAN_COMPILE_DEFINITIONS_GTEST})
endif()