CMake: Do not add conan global compiler flags
+ Add conan-gtest compile definitions for the unit_tests target
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user