Skip to content
Snippets Groups Projects
Commit cbd58fce authored by Joseph Boudreau's avatar Joseph Boudreau
Browse files

Editing CMakeLists again

parents 0c719828 c4bd7307
Branches
No related tags found
1 merge request!458Switch all Qt-based components (FSL and gmex) to QT6.
......@@ -36,13 +36,17 @@ endif()
include( SetupEigen3 )
include( SetupXercesC )
include( SetupJSON )
<<<<<<< HEAD
# Add the GoogleTest framework, for tests
find_package(GTest REQUIRED)
include_directories(${GTEST_INCLUDE_DIRS})
=======
>>>>>>> c4bd7307ff48fd74b49ce31ba11106266ecbbd8a
# Find the dependencies that the project always picks up from its environment.
find_package( SQLite3 3.7.17 )
<<<<<<< HEAD
# === Enable testing functionality
# NOTE: this must be in the root CMakeLists.txt file
# even if the tests are defined in CMake files
......@@ -50,6 +54,8 @@ find_package( SQLite3 3.7.17 )
enable_testing()
=======
>>>>>>> c4bd7307ff48fd74b49ce31ba11106266ecbbd8a
# === Main targets built by this project ===
# switches to let users build specific packages on request
......@@ -88,7 +94,10 @@ endif()
if(GEOMODEL_BUILD_FULLSIMLIGHT_PROFILING)
set(GEOMODEL_BUILD_FULLSIMLIGHT ON CACHE BOOL "Enable the build of FullSimLight" FORCE)
<<<<<<< HEAD
include(CTest) # needs to be included at the top level
=======
>>>>>>> c4bd7307ff48fd74b49ce31ba11106266ecbbd8a
endif()
# a list to keep track of the packages we build
......@@ -103,6 +112,10 @@ if(GEOMODEL_BUILD_ALL)
set(GEOMODEL_BUILD_TOOLS TRUE)
set(GEOMODEL_BUILD_VISUALIZATION TRUE)
set(GEOMODEL_BUILD_FSL TRUE)
<<<<<<< HEAD
=======
set(GEOMODEL_BUILD_TESTING TRUE)
>>>>>>> c4bd7307ff48fd74b49ce31ba11106266ecbbd8a
endif()
if(GEOMODEL_BUILD_TOOLS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment