You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/app-admin/passwordsafe/files/passwordsafe-1.06_beta-syst...

70 lines
2.9 KiB

--- a/CMakeLists.txt 2018-08-11 09:54:05.000000000 +0200
+++ b/CMakeLists.txt 2018-08-22 10:48:06.422755215 +0200
@@ -91,6 +91,7 @@
# Configurable options:
option (NO_YUBI "Set ON to disable YubiKey support" OFF)
option (NO_GTEST "Set ON to disable gtest unit testing" OFF)
+option (SYSTEM_GTEST "Set ON to use gtest provided by the system" OFF)
if (WIN32)
option (WX_WINDOWS "Build wxWidget under Windows" OFF)
@@ -256,31 +257,36 @@
endif (MSVC)
if (NOT NO_GTEST)
- # Download and unpack googletest at configure time
- # See https://crascit.com/2015/07/25/cmake-gtest/
- configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt)
- execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+ if (NOT SYSTEM_GTEST)
+ # Download and unpack googletest at configure time
+ # See https://crascit.com/2015/07/25/cmake-gtest/
+ configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt)
+ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
- execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+ execute_process(COMMAND "${CMAKE_COMMAND}" --build .
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
+ # Prevent GoogleTest from overriding our compiler/linker options
+ # when building with Visual Studio
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+ # Set some other gtest configurations:
+ set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
+ set(BUILD_GTEST ON CACHE BOOL "" FORCE)
+ set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+
+ # Add googletest directly to our build. This adds
+ # the following targets: gtest, gtest_main, gmock
+ # and gmock_main
+ add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
+ "${CMAKE_BINARY_DIR}/googletest-build")
+
+ include_directories("${gtest_SOURCE_DIR}/include"
+# "${gmock_SOURCE_DIR}/include"
+ )
+ else (NOT SYSTEM_GTEST)
+ find_package(GTest REQUIRED)
+ set(GTEST_LIBRARIES ${GTEST_BOTH_LIBRARIES})
+ endif(NOT SYSTEM_GTEST)
- # Prevent GoogleTest from overriding our compiler/linker options
- # when building with Visual Studio
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
- # Set some other gtest configurations:
- set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
- set(BUILD_GTEST ON CACHE BOOL "" FORCE)
- set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
-
- # Add googletest directly to our build. This adds
- # the following targets: gtest, gtest_main, gmock
- # and gmock_main
- add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
- "${CMAKE_BINARY_DIR}/googletest-build")
-
- include_directories("${gtest_SOURCE_DIR}/include"
-# "${gmock_SOURCE_DIR}/include"
- )
endif(NOT NO_GTEST)
if (WIN32 AND NOT WX_WINDOWS)