Skip to content

Commit 10ba981

Browse files
authored
Merge pull request #47 from duncanmmacleod/external-gtest
Allow disabling build of vendored gtest with new cmake option EXTERNAL_GTEST
2 parents 17f8f9c + 563b39b commit 10ba981

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ cmake_minimum_required( VERSION 2.6 )
33
project( scitokens-cpp )
44

55
option( BUILD_UNITTESTS "Build the scitokens-cpp unit tests" OFF )
6+
option( EXTERNAL_GTEST "Use an external/pre-installed copy of GTest" OFF )
67

78
set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
89

@@ -69,13 +70,14 @@ add_executable(scitokens-create src/create.cpp)
6970
target_link_libraries(scitokens-create SciTokens)
7071

7172
if( BUILD_UNITTESTS )
72-
73+
if( NOT EXTERNAL_GTEST )
7374
include(ExternalProject)
7475
ExternalProject_Add(gtest
7576
PREFIX external/gtest
76-
URL file://${PROJECT_SOURCE_DIR}/vendor/gtest
77+
URL ${CMAKE_CURRENT_SOURCE_DIR}/vendor/gtest
7778
INSTALL_COMMAND :
7879
)
80+
endif()
7981
enable_testing()
8082
add_subdirectory(test)
8183
endif()

test/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ add_executable(scitokens-gtest main.cpp)
33
add_dependencies(scitokens-gtest gtest)
44
include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include")
55

6-
target_link_libraries(scitokens-gtest SciTokens "${CMAKE_BINARY_DIR}/external/gtest/src/gtest-build/lib/libgtest.a" -lpthread)
6+
if(EXTERNAL_GTEST)
7+
set(LIBGTEST "gtest")
8+
else()
9+
set(LIBGTEST "${CMAKE_BINARY_DIR}/external/gtest/src/gtest-build/lib/libgtest.a")
10+
endif()
11+
12+
target_link_libraries(scitokens-gtest SciTokens "${LIBGTEST}" pthread)
713

814
add_test(
915
NAME

0 commit comments

Comments
 (0)