ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/REPOS_ERICCA/magic/CMakeLists.txt
(Generate patch)

Comparing magic/CMakeLists.txt (file contents):
Revision 686 by francois, Tue Jul 7 14:45:11 2015 UTC vs.
Revision 757 by francois, Fri Nov 6 13:42:55 2015 UTC

# Line 22 | Line 22 | option(ENABLE_NUTIL "Magic Enable NUTIL
22   option(ENABLE_TEST "Magic Enable test" OFF)
23   option(ENABLE_ENGLISH "Magic Use English" OFF)
24   option(ENABLE_TUTORIEL "Magic turorial" OFF)
25 + option(ENABLE_CHOIX_TERMINAL_ASTER "Magic Choix d'un terminal pour executer Code Aster" ON)
26  
27  
28 + message(STATUS "The compiler is ${CMAKE_CXX_COMPILER}.")
29 +
30 + include(CheckCXXCompilerFlag)
31 + CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
32 + CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
33 + if(COMPILER_SUPPORTS_CXX11)
34 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
35 + elseif(COMPILER_SUPPORTS_CXX0X)
36 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
37 + else()
38 +        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
39 + endif()
40 +
41   set(CADXFEM_PATH "../cadxfem" CACHE STRING "CADXFEM Path")
42  
43   if(ENABLE_OCC)
44    set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
45    set(OCC_LIBS_REQUIRED
46        # subset of DataExchange
47 <      TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
47 >      TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase TKXCAF TKXDESTEP
48        # ModelingAlgorithms
49        TKOffset TKFeat TKFillet TKBool TKShHealing TKMesh TKHLR TKBO TKPrim
50        TKTopAlgo TKGeomAlgo
# Line 114 | Line 128 | if (ENABLE_CAD4FE)
128   add_definitions(-DUSECAD4FE)
129   endif(ENABLE_CAD4FE)
130  
131 + if (ENABLE_CHOIX_TERMINAL_ASTER)
132 + add_definitions(-DCHOIXTERMASTER)
133 + endif(ENABLE_CHOIX_TERMINAL_ASTER)
134 +
135  
136   message(STATUS "Configuration de MAGiC${annee}:1999-${dateannee}")
137  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines