From 244f00bf3a24e5cb8534e76717d0d2e01d92c908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Mon, 5 Nov 2018 17:10:54 +0100 Subject: [PATCH] CMake: Do not add conan global compiler flags + Add conan-gtest compile definitions for the unit_tests target --- cmake/findDependencies.cmake | 2 +- unitTests/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake index c86857d8..05d991b3 100644 --- a/cmake/findDependencies.cmake +++ b/cmake/findDependencies.cmake @@ -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) diff --git a/unitTests/CMakeLists.txt b/unitTests/CMakeLists.txt index 60e3b539..b8f89e06 100644 --- a/unitTests/CMakeLists.txt +++ b/unitTests/CMakeLists.txt @@ -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()