mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-21 20:09:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update SGCT, make use of new googletest submodule in Ghoul

Browse Source
This commit is contained in:
Alexander Bock
2016-09-25 19:50:41 +02:00
parent 603e671a34
commit 568ebd51ff
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/ghoul
+1 -1
Submodule ext/ghoul updated: e45911445d...7779a2e87c
ext/sgct
+1 -1
Submodule ext/sgct updated: 9ad36dbaa5...fb95dc335b
support/cmake/support_macros.cmake
+17 -3
View File
@@ -291,7 +291,15 @@ endfunction ()
function (handle_option_tests)
if (OPENSPACE_HAVE_TESTS)
if (NOT TARGET gtest)
add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/gtest)
set(BUILD_GTEST ON CACHE BOOL "")
set(BUILD_GMOCK OFF CACHE BOOL "")
set(gtest_force_shared_crt ON CACHE BOOL "")
# set(BUILD_GMOCK OFF CACHE BOOL "")
# option(BUILD_GTEST "Builds the googletest subproject" CACHE ON)
# option(BUILD_GMOCK "Builds the googlemock subproject" CACHE OFF)
# option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." CACHE ON)
add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/googletest)
# add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/gtest)
set_property(TARGET gtest PROPERTY FOLDER "External")
endif ()
@@ -301,7 +309,7 @@ function (handle_option_tests)
target_include_directories(OpenSpaceTest PUBLIC
"${OPENSPACE_BASE_DIR}/include"
"${OPENSPACE_BASE_DIR}/tests"
"${OPENSPACE_EXT_DIR}/ghoul/ext/gtest/include"
"${OPENSPACE_EXT_DIR}/ghoul/ext/googletest/googletest/include"
)
target_link_libraries(OpenSpaceTest gtest libOpenSpace)
@@ -316,7 +324,13 @@ function (handle_option_tests)
endif (OPENSPACE_HAVE_TESTS)
if (TARGET GhoulTest)
if (NOT TARGET gtest)
add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/gtest)
set(BUILD_GTEST ON CACHE BOOL "")
set(BUILD_GMOCK OFF CACHE BOOL "")
set(gtest_force_shared_crt ON CACHE BOOL "")
# option(BUILD_GTEST "Builds the googletest subproject" CACHE ON)
# option(BUILD_GMOCK "Builds the googlemock subproject" CACHE OFF)
# option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." CACHE ON)
add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/googletest)
endif ()
set_property(TARGET gtest PROPERTY FOLDER "External")