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 617 by francois, Tue Dec 2 03:11:05 2014 UTC vs.
Revision 757 by francois, Fri Nov 6 13:42:55 2015 UTC

# Line 15 | Line 15 | project(MAGIC)
15   option(ENABLE_OCC "Magic Enable Occ" ON)
16   option(ENABLE_SAT "Magic Enable Sat" ON)
17   option(ENABLE_STEP "Magic Enable Step" ON)
18 + option(ENABLE_CAD4FE "Magic Enable CAD4FE" ON)
19   option(ENABLE_IBREP "Magic Enable IBREP" OFF)
20   option(ENABLE_TOIBREP "Magic Enable TOIBREP" ON)
21   option(ENABLE_NUTIL "Magic Enable NUTIL (pour la visu VTK)" OFF)
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 90 | Line 105 | endif(ENABLE_SAT)
105  
106   if(ENABLE_OCC)
107   add_definitions(-DBREP_OCC)
108 + add_definitions(-DCSG_OCC)
109   endif(ENABLE_OCC)
110   if(ENABLE_STEP)
111   add_definitions(-DBREP_STEP)
# Line 105 | Line 121 | add_definitions(-DIBREP)
121   endif(ENABLE_IBREP)
122   if(ENABLE_NUTIL)
123   add_subdirectory(${CADXFEM_PATH}/nutil "${CMAKE_CURRENT_BINARY_DIR}/nutil")
124 < #add_definitions(-DVTK_INTERFACE)
124 > add_definitions(-DVTK_INTERFACE)
125   endif(ENABLE_NUTIL)
126  
127 + 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  
138  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines