From 4b686a34dc6e4cfecb79e76587b1dd415ccd7a7c Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Fri, 9 Oct 2015 10:19:10 +0000
Subject: [PATCH] CMakeLists.txt updated
---
AMDiS/CMakeLists.txt | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/AMDiS/CMakeLists.txt b/AMDiS/CMakeLists.txt
index 4467ea15..b1a0b278 100644
--- a/AMDiS/CMakeLists.txt
+++ b/AMDiS/CMakeLists.txt
@@ -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()
--
GitLab