X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fexternal%2Fgmock-1.7.0%2FCMakeLists.txt;h=c9404bf48be0b3eef9b666d115a8fcbe65910753;hb=2c8e4fac688f51c7b779c13a542f4700a221715d;hp=d0552fb3f968f8d0fcb39e45e6ac343d7d2eaf5a;hpb=6d1bc0a87809729252a3e706b6ff24c9df35c57f;p=alexxy%2Fgromacs.git diff --git a/src/external/gmock-1.7.0/CMakeLists.txt b/src/external/gmock-1.7.0/CMakeLists.txt index d0552fb3f9..c9404bf48b 100644 --- a/src/external/gmock-1.7.0/CMakeLists.txt +++ b/src/external/gmock-1.7.0/CMakeLists.txt @@ -37,8 +37,6 @@ include(gmxGetGmockTupleWorkaround) get_gmock_tuple_workaround(GMOCK_COMPILE_DEFINITIONS) -set(GMOCK_COMPILE_DEFINITIONS "_GNU_SOURCE=1;${GMOCK_COMPILE_DEFINITIONS}") -set(GMOCK_COMPILE_DEFINITIONS ${GMOCK_COMPILE_DEFINITIONS} PARENT_SCOPE) # GTest/GMock suggest linking with pthreads when available for thread safety set(CMAKE_THREAD_PREFER_PTHREAD 1) @@ -68,9 +66,11 @@ if (HAS_NO_UNUSED_VARIABLE) endif() add_library(gmock STATIC ${UNITTEST_TARGET_OPTIONS} ${GMOCK_SOURCES} ${GTEST_SOURCES}) -set_property(TARGET gmock APPEND PROPERTY COMPILE_DEFINITIONS "${GMOCK_COMPILE_DEFINITIONS}") +set_property(TARGET gmock APPEND PROPERTY COMPILE_DEFINITIONS + "_GNU_SOURCE=1;${GMOCK_COMPILE_DEFINITIONS}") set(GMOCK_LIBRARIES gmock ${PTHREADS_LIBRARIES} PARENT_SCOPE) set(GTEST_LIBRARIES ${GMOCK_LIBRARIES} PARENT_SCOPE) set(GMOCK_INCLUDE_DIRS ${GMOCK_INCLUDE_DIRS} PARENT_SCOPE) set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} PARENT_SCOPE) +set(GMOCK_COMPILE_DEFINITIONS ${GMOCK_COMPILE_DEFINITIONS} PARENT_SCOPE)