Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Aland, Sebastian
amdis
Commits
4b686a34
Commit
4b686a34
authored
Oct 09, 2015
by
Praetorius, Simon
Browse files
CMakeLists.txt updated
parent
27c3af63
Changes
1
Hide whitespace changes
Inline
Side-by-side
AMDiS/CMakeLists.txt
View file @
4b686a34
...
...
@@ -15,12 +15,7 @@ SET(MTL_INCLUDE_DIR ${LIB_DIR}/mtl4/ CACHE PATH "mtl4 directory")
set
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-DDEBUG=0"
)
#-Wno-unused-but-set-variable
set
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DDEBUG=1 -O0"
)
#-Wno-unused-but-set-variable
if
(
NOT CurrentRevision
)
find_package
(
Subversion
)
if
(
Subversion_FOUND
)
Subversion_WC_INFO
(
${
CMAKE_CURRENT_SOURCE_DIR
}
svn_info
)
#message("svn-rev: ${svn_info_WC_REVISION}")
set
(
CurrentRevision
"0.9.
${
svn_info_WC_REVISION
}
"
)
endif
()
set
(
CurrentRevision
"0.9"
)
endif
()
if
(
NOT AMDIS_MAJOR
)
set
(
AMDIS_MAJOR
"0"
)
...
...
@@ -627,10 +622,16 @@ endif(WIN32)
if
(
ENABLE_CXX11
)
list
(
APPEND COMPILEFLAGS
"-DHAS_CXX11=1"
)
if
(
${
CMAKE_VERSION
}
VERSION_GREATER
"3.0"
)
set_property
(
TARGET
"amdis"
PROPERTY CXX_STANDARD_REQUIRED 11
)
set_property
(
TARGET
"compositeFEM"
PROPERTY CXX_STANDARD_REQUIRED 11
)
set_property
(
TARGET
"reinit"
PROPERTY CXX_STANDARD_REQUIRED 11
)
set_property
(
TARGET
"muparser"
PROPERTY CXX_STANDARD_REQUIRED 11
)
set_property
(
TARGET
"amdis"
PROPERTY CXX_STANDARD 11
)
set_property
(
TARGET
"compositeFEM"
PROPERTY CXX_STANDARD 11
)
set_property
(
TARGET
"reinit"
PROPERTY CXX_STANDARD 11
)
set_property
(
TARGET
"muparser"
PROPERTY CXX_STANDARD 11
)
set_property
(
TARGET
"amdis"
PROPERTY CXX_STANDARD_REQUIRED ON
)
set_property
(
TARGET
"compositeFEM"
PROPERTY CXX_STANDARD_REQUIRED ON
)
set_property
(
TARGET
"reinit"
PROPERTY CXX_STANDARD_REQUIRED ON
)
set_property
(
TARGET
"muparser"
PROPERTY CXX_STANDARD_REQUIRED ON
)
else
()
list
(
APPEND COMPILEFLAGS
"-std=c++11"
)
endif
()
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment