Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Özgür Ozan Sen
ogs
Commits
dd30b41f
Commit
dd30b41f
authored
12 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
Added CMake option OGS_CXX_FLAGS for user-given compiler flags.
Note that the flags are only appended, not substituted.
parent
0c9c11b8
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-0
3 additions, 0 deletions
CMakeLists.txt
Tests/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Tests/CMakeLists.txt
scripts/cmake/CompilerSetup.cmake
+3
-0
3 additions, 0 deletions
scripts/cmake/CompilerSetup.cmake
with
7 additions
and
1 deletion
CMakeLists.txt
+
3
−
0
View file @
dd30b41f
...
...
@@ -58,6 +58,9 @@ OPTION(OGS_NO_EXTERNAL_LIBS "Builds OGS without any external dependencies." OFF)
# Logging
OPTION
(
OGS_DISABLE_LOGGING
"Disables all logog messages."
OFF
)
# Compiler flags
SET
(
OGS_CXX_FLAGS
""
CACHE STRING
"Additional C++ compiler flags."
)
# Search paths
SET
(
OGS_LIBS_DIR
""
CACHE PATH
"The path to the compiled third party libs (mainly used for Windows)."
)
...
...
This diff is collapsed.
Click to expand it.
Tests/CMakeLists.txt
+
1
−
1
View file @
dd30b41f
...
...
@@ -22,7 +22,7 @@ TARGET_LINK_LIBRARIES(testrunner
BaseLib
GeoLib
${
Boost_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
${
CMAKE_THREAD_LIBS_INIT
}
)
# Add make-target test which runs the testrunner
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/CompilerSetup.cmake
+
3
−
0
View file @
dd30b41f
...
...
@@ -15,6 +15,9 @@ ELSEIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
SET
(
COMPILER_IS_MSVC TRUE
)
ENDIF
()
# CMAKE_CXX_COMPILER_ID
# Set additional user-given compiler flags
SET
(
CMAKE_CXX_FLAGS
${
OGS_CXX_FLAGS
}
)
### GNU C/CXX compiler
IF
(
COMPILER_IS_GCC
)
get_gcc_version
(
GCC_VERSION
)
...
...
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