Loading README.md +10 −0 Original line number Diff line number Diff line Loading @@ -299,6 +299,16 @@ thus licensed under [MPL-2](http://www.mozilla.org/MPL/2.0/FAQ.html) . ChangeLog ========= v0.5.4 ====== - upgrade google test library v0.5.3 ====== - fix some problem with pow() v0.5.2 ====== Loading thirdparty/CMakeLists.txt +14 −32 Original line number Diff line number Diff line Loading @@ -26,41 +26,23 @@ else (NOT WIN32) endif (NOT WIN32) # # Google test (https://github.com/google/googletest/blob/master/googletest/README.md) # # Download and unpack googletest at configure time configure_file (CMakeLists-gt.txt.in googletest-download/CMakeLists.txt) execute_process (COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . RESULT_VARIABLE result WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download) if (result) message (FATAL_ERROR "CMake step for googletest failed: ${result}") endif () execute_process (COMMAND ${CMAKE_COMMAND} --build . RESULT_VARIABLE result WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download) if (result) message (FATAL_ERROR "Build step for googletest failed: ${result}") endif () # Google test # https://google.github.io/googletest/quickstart-cmake.html include (FetchContent) FetchContent_Declare ( googletest # URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip URL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz #URL_HASH MD5= DOWNLOAD_DIR "$ENV{HOME}/Downloads" ) # Prevent overriding the parent project's compiler/linker # settings on Windows # For Windows: Prevent overriding the parent project's compiler/linker settings set (gtest_force_shared_crt ON CACHE BOOL "" FORCE) FetchContent_MakeAvailable (googletest) # Add googletest directly to our build. This defines # the gtest and gtest_main targets. add_subdirectory ( ${CMAKE_CURRENT_BINARY_DIR}/googletest-src ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL) # The gtest/gtest_main targets carry header search path # dependencies automatically when using CMake 2.8.11 or # later. Otherwise we have to add them here ourselves. if (CMAKE_VERSION VERSION_LESS 2.8.11) include_directories ("${gtest_SOURCE_DIR}/include") endif () include (GoogleTest) # Can simply link against gtest or gtest_main as needed. Eg #add_executable (example example.cpp) Loading Loading
README.md +10 −0 Original line number Diff line number Diff line Loading @@ -299,6 +299,16 @@ thus licensed under [MPL-2](http://www.mozilla.org/MPL/2.0/FAQ.html) . ChangeLog ========= v0.5.4 ====== - upgrade google test library v0.5.3 ====== - fix some problem with pow() v0.5.2 ====== Loading
thirdparty/CMakeLists.txt +14 −32 Original line number Diff line number Diff line Loading @@ -26,41 +26,23 @@ else (NOT WIN32) endif (NOT WIN32) # # Google test (https://github.com/google/googletest/blob/master/googletest/README.md) # # Download and unpack googletest at configure time configure_file (CMakeLists-gt.txt.in googletest-download/CMakeLists.txt) execute_process (COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . RESULT_VARIABLE result WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download) if (result) message (FATAL_ERROR "CMake step for googletest failed: ${result}") endif () execute_process (COMMAND ${CMAKE_COMMAND} --build . RESULT_VARIABLE result WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download) if (result) message (FATAL_ERROR "Build step for googletest failed: ${result}") endif () # Google test # https://google.github.io/googletest/quickstart-cmake.html include (FetchContent) FetchContent_Declare ( googletest # URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip URL https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz #URL_HASH MD5= DOWNLOAD_DIR "$ENV{HOME}/Downloads" ) # Prevent overriding the parent project's compiler/linker # settings on Windows # For Windows: Prevent overriding the parent project's compiler/linker settings set (gtest_force_shared_crt ON CACHE BOOL "" FORCE) FetchContent_MakeAvailable (googletest) # Add googletest directly to our build. This defines # the gtest and gtest_main targets. add_subdirectory ( ${CMAKE_CURRENT_BINARY_DIR}/googletest-src ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL) # The gtest/gtest_main targets carry header search path # dependencies automatically when using CMake 2.8.11 or # later. Otherwise we have to add them here ourselves. if (CMAKE_VERSION VERSION_LESS 2.8.11) include_directories ("${gtest_SOURCE_DIR}/include") endif () include (GoogleTest) # Can simply link against gtest or gtest_main as needed. Eg #add_executable (example example.cpp) Loading