Use shared gtest instead of submodule diff --git a/CMakeLists.txt b/CMakeLists.txt index 617e4b2..2857875 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") include(GNUInstallDirs) project(leelaz) -add_subdirectory(gtest EXCLUDE_FROM_ALL) # We don't want to install gtest, exclude it from `all` # Required Packages set(Boost_MIN_VERSION "1.58.0") @@ -27,6 +26,7 @@ find_package(Boost 1.58.0 REQUIRED program_options filesystem) find_package(Threads REQUIRED) find_package(ZLIB REQUIRED) find_package(OpenCL REQUIRED) +find_package(GTest REQUIRED) # We need OpenBLAS for now, because we make some specific # calls. Ideally we'd use OpenBLAS is possible and fall back to # not doing those calls if it's not present. @@ -93,6 +93,7 @@ include_directories(${IncludePath}) include_directories(${Boost_INCLUDE_DIRS}) include_directories(${OpenCL_INCLUDE_DIRS}) include_directories(${ZLIB_INCLUDE_DIRS}) +include_directories(${GTEST_INCLUDE_DIRS}) if((UNIX AND NOT APPLE) OR WIN32) include_directories(${BLAS_INCLUDE_DIRS}) @@ -141,7 +142,8 @@ target_link_libraries(tests ${Boost_LIBRARIES}) target_link_libraries(tests ${BLAS_LIBRARIES}) target_link_libraries(tests ${OpenCL_LIBRARIES}) target_link_libraries(tests ${ZLIB_LIBRARIES}) -target_link_libraries(tests gtest_main ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(tests ${GTEST_BOTH_LIBRARIES}) +target_link_libraries(tests ${CMAKE_THREAD_LIBS_INIT}) include(GetGitRevisionDescription) git_describe(VERSION --tags) d-aux/test-env.in'>
path: root/build-aux/test-env.in
AgeCommit message (Expand)Author
2021-12-22tests: Move keys into ./tests/keys/ and add a third ed25519 key....The third key will be used in an upcoming commit. Rename public keys to .pub. * guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable. (%ed25519-3-secret-key-file): New variable. (%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file. (%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file. * tests/keys/ed25519-3.key: New file. * tests/keys/ed25519-3.sec: New file. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Attila Lendvai
2021-04-20import: Remove Nix importer....This importer has suffered from bitrot and no longer works with current Nix and Nixpkgs. See <https://bugs.gnu.org/32339> and <https://bugs.gnu.org/36255>. * guix/import/snix.scm, guix/scripts/import/nix.scm, tests/snix.scm: Remove. * Makefile.am (MODULES, SCM_TESTS): Remove them. * guix/scripts/import.scm (importers): Remove "nix". * build-aux/test-env.in: Remove NIXPKGS variable. * configure.ac: Remove '--with-nixpkgs' option. * doc/guix.texi (Invoking guix import): Remove bit about "guix import nix". * etc/completion/fish/guix.fish: Likewise. Ludovic Courtès