From 64b66bbfe7b55d45a293fe7724a28532e81eecb3 Mon Sep 17 00:00:00 2001 From: khizmax Date: Tue, 25 Apr 2017 00:01:40 +0300 Subject: [PATCH] Added cleaning after CHECK_CXX_SOURCE_COMPILES call --- test/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index be3587eb..ee6f62a2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -27,6 +27,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_LANG_CXX11") # to specify a function or functor that generates custom test name suffixes # based on the test parameters. The function should accept one argument of # type testing::TestParamInfo, and return std::string. +set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) +set(OLD_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES}) +set(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) set(CMAKE_REQUIRED_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE ${CMAKE_EXE_LINKER_FLAGS}") set(CMAKE_REQUIRED_INCLUDES ${GTEST_INCLUDE_DIRS} ) set(CMAKE_REQUIRED_LIBRARIES ${GTEST_LIBRARIES} ${EXTERNAL_SYSTEM_LIBS} ) @@ -57,8 +60,11 @@ int main( int argc, char **argv ) return RUN_ALL_TESTS(); } " GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG ) +set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) +set(CMAKE_REQUIRED_INCLUDES ${OLD_CMAKE_REQUIRED_INCLUDES}) +set(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) -if( GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG ) +if(GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_LANG_CXX11 -DCDSTEST_GTEST_INSTANTIATE_TEST_CASE_P_HAS_4TH_ARG") endif() -- 2.34.1