Commit 078546fb authored by Jan Möbius's avatar Jan Möbius

Updated gtest finder

parent d691207a
Pipeline #7039 failed with stage
in 4 minutes and 12 seconds
...@@ -45,7 +45,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) ...@@ -45,7 +45,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
~/sw/gtest-1.8.0/include ~/sw/gtest-1.8.0/include
~/sw/gtest-1.7.0/include ~/sw/gtest-1.7.0/include
~/sw/gtest/include ~/sw/gtest/include
/ACG/acgdev/gcc-4.7-x86_64/gtest/include /ACG/acgdev/gcc-x86_64/gtest/include
/opt/local/include /opt/local/include
/usr/local/include /usr/local/include
/usr/include /usr/include
...@@ -56,10 +56,10 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) ...@@ -56,10 +56,10 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
~/sw/gtest-1.8.0/lib ~/sw/gtest-1.8.0/lib
~/sw/gtest-1.7.0/lib ~/sw/gtest-1.7.0/lib
~/sw/gtest/lib ~/sw/gtest/lib
/ACG/acgdev/gcc-4.7-x86_64/gtest/lib /ACG/acgdev/gcc-x86_64/gtest/lib
/opt/local/lib /opt/local/lib
/usr/local/lib /usr/local/lib
/usr/lib /usr/include
"C:/libs/win32/gtest/lib" "C:/libs/win32/gtest/lib"
NO_DEFAULT_PATH ) NO_DEFAULT_PATH )
find_library(_GTEST_MAIN_LIBRARY gtest_main find_library(_GTEST_MAIN_LIBRARY gtest_main
...@@ -67,10 +67,10 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) ...@@ -67,10 +67,10 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
~/sw/gtest-1.8.0/lib ~/sw/gtest-1.8.0/lib
~/sw/gtest-1.7.0/lib ~/sw/gtest-1.7.0/lib
~/sw/gtest/lib ~/sw/gtest/lib
/ACG/acgdev/gcc-4.7-x86_64/gtest/lib /ACG/acgdev/gcc-x86_64/gtest/lib
/opt/local/lib /opt/local/lib
/usr/local/lib /usr/local/lib
/usr/lib /usr/include
"C:/libs/win32/gtest/lib" "C:/libs/win32/gtest/lib"
NO_DEFAULT_PATH ) NO_DEFAULT_PATH )
...@@ -84,24 +84,29 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) ...@@ -84,24 +84,29 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
set(GTEST_INCLUDE_DIRS ${_GTEST_INCLUDE_DIR} CACHE PATH set(GTEST_INCLUDE_DIRS ${_GTEST_INCLUDE_DIR} CACHE PATH
"Include directories for Google Test framework") "Include directories for Google Test framework")
if ( NOT WIN32 ) if ( NOT WIN32 )
set(GTEST_LIBRARIES ${_GTEST_LIBRARY} CACHE FILEPATH set(GTEST_LIBRARIES ${_GTEST_LIBRARY} CACHE FILEPATH
"Libraries to link for Google Test framework") "Libraries to link for Google Test framework")
set(GTEST_MAIN_LIBRARIES ${_GTEST_MAIN_LIBRARY} CACHE FILEPATH set(GTEST_MAIN_LIBRARIES ${_GTEST_MAIN_LIBRARY} CACHE FILEPATH
"Libraries to link for Google Test automatic main() definition") "Libraries to link for Google Test automatic main() definition")
else() set(GTEST_MAIN_LIBRARY ${_GTEST_MAIN_LIBRARY} CACHE FILEPATH
set(GTEST_LIBRARIES "optimized;gtest;debug;gtestd" CACHE FILEPATH "Libraries to link for Google Test automatic main() definition")
else()
set(GTEST_LIBRARIES "optimized;gtest;debug;gtestd" CACHE FILEPATH
"Libraries to link for Google Test framework") "Libraries to link for Google Test framework")
set(GTEST_MAIN_LIBRARIES "optimized;gtest_main;debug;gtest_maind" CACHE FILEPATH set(GTEST_MAIN_LIBRARIES "optimized;gtest_main;debug;gtest_maind" CACHE FILEPATH
"Libraries to link for Google Test automatic main() definition") "Libraries to link for Google Test automatic main() definition")
endif() set(GTEST_MAIN_LIBRARY "optimized;gtest_main;debug;gtest_maind" CACHE FILEPATH
"Libraries to link for Google Test automatic main() definition")
endif()
# Macro required to use google test with vs2012 # Macro required to use google test with vs2012
if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" )
add_definitions(-D_VARIADIC_MAX=10) add_definitions(-D_VARIADIC_MAX=10)
endif() endif()
set(GTEST_LIBRARY ${_GTEST_LIBRARY} CACHE FILEPATH
"GTest Libraries")
set(GTEST_LIBRARY_DIR ${_GTEST_LIBRARY_DIR} CACHE FILEPATH set(GTEST_LIBRARY_DIR ${_GTEST_LIBRARY_DIR} CACHE FILEPATH
"Library dir containing Google Test libraries") "Library dir containing Google Test libraries")
mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_LIBRARY_DIR ) mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_LIBRARY_DIR )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment