Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GeoModel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GeoModelDev
GeoModel
Commits
cbd58fce
Commit
cbd58fce
authored
1 month ago
by
Joseph Boudreau
Browse files
Options
Downloads
Plain Diff
Editing CMakeLists again
parents
0c719828
c4bd7307
Branches
Branches containing commit
No related tags found
1 merge request
!458
Switch all Qt-based components (FSL and gmex) to QT6.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+13
-0
13 additions, 0 deletions
CMakeLists.txt
with
13 additions
and
0 deletions
CMakeLists.txt
+
13
−
0
View file @
cbd58fce
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment