Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
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
mantidproject
mantid
Commits
882f94e7
Unverified
Commit
882f94e7
authored
6 years ago
by
Savici, Andrei T.
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #23696 from mantidproject/23606-conda
enable conda build using anaconda gcc
parents
a379afc9
120b8911
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
buildconfig/CMake/GNUSetup.cmake
+1
-1
1 addition, 1 deletion
buildconfig/CMake/GNUSetup.cmake
with
1 addition
and
1 deletion
buildconfig/CMake/GNUSetup.cmake
+
1
−
1
View file @
882f94e7
...
...
@@ -22,7 +22,7 @@ if ( CMAKE_COMPILER_IS_GNUCXX )
endif
()
set
(
GCC_COMPILER_VERSION
${
CMAKE_CXX_COMPILER_VERSION
}
CACHE INTERNAL
""
)
message
(
STATUS
"gcc version:
${
GCC_COMPILER_VERSION
}
"
)
if
(
GCC_COMPILER_VERSION VERSION_LESS
"5.1.0"
)
if
(
NOT
(
GCC_COMPILER_VERSION VERSION_LESS
"5.1.0"
)
)
# Add an option to use the old C++ ABI if gcc is 5 series
option
(
USE_CXX98_ABI
"If enabled, sets the _GLIBCXX_USE_CXX11_ABI=0 compiler flag"
OFF
)
if
(
USE_CXX98_ABI
)
...
...
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