From 43b5c4e8f417414f557cf1c152ca98f78cac7619 Mon Sep 17 00:00:00 2001
From: jlaura <jlaura@usgs.gov>
Date: Mon, 18 Feb 2019 10:25:54 -0700
Subject: [PATCH] Makes GTest fully optional (#175)
---
CMakeLists.txt | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index afea28a..c987943 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.10)
project(usgscsm VERSION 0.0.1 DESCRIPTION "usgscsm library")
-
+
+include(GoogleTest)
include(cmake/gtest.cmake)
include(GNUInstallDirs)
-include(GoogleTest)
set(CMAKE_CXX_STANDARD 11)
@@ -44,12 +44,8 @@ target_include_directories(usgscsm
${CSM_INCLUDE_DIR}
)
-# Setup for GoogleTest
-find_package (Threads)
-
target_link_libraries(usgscsm
- ${CSM_LIBRARY}
- gtest ${CMAKE_THREAD_LIBS_INIT})
+ ${CSM_LIBRARY})
if(WIN32)
install(TARGETS usgscsm RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -62,6 +58,12 @@ install(DIRECTORY ${USGSCSM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR
# Optional build or link against CSM
option (BUILD_TESTS "Build tests" ON)
if(BUILD_TESTS)
+
+ # Setup for GoogleTest
+ find_package (Threads)
+
+ target_link_libraries(usgscsm
+ gtest ${CMAKE_THREAD_LIBS_INIT})
include(CTest)
enable_testing()
add_subdirectory(tests)
--
GitLab