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 867 by francois, Tue Jan 17 15:44:11 2017 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 < set(CADXFEM_PATH "../cadxfem" CACHE STRING "CADXFEM Path")
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 + set(ASTER_VERSION_FLAG "12.5" CACHE STRING "Version par défaut de Code ASTER dans la compilation")
43 + add_definitions(-DASTER_VERSION_DEFAUT="${ASTER_VERSION_FLAG}")
44   if(ENABLE_OCC)
45    set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
46    set(OCC_LIBS_REQUIRED
47        # subset of DataExchange
48 <      TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
48 >      TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase TKXCAF TKXDESTEP
49        # ModelingAlgorithms
50        TKOffset TKFeat TKFillet TKBool TKShHealing TKMesh TKHLR TKBO TKPrim
51        TKTopAlgo TKGeomAlgo
52        # ModelingData
53        TKBRep TKGeomBase TKG3d TKG2d
54        # FoundationClasses
55 <      TKAdvTools TKMath TKernel)
55 >      #TKAdvTools
56 >      TKMath TKernel)
57    list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
58    set(OCC_LIBS)
59    foreach(OCC ${OCC_LIBS_REQUIRED})
# Line 90 | Line 107 | endif(ENABLE_SAT)
107  
108   if(ENABLE_OCC)
109   add_definitions(-DBREP_OCC)
110 + add_definitions(-DCSG_OCC)
111   endif(ENABLE_OCC)
112   if(ENABLE_STEP)
113   add_definitions(-DBREP_STEP)
# Line 105 | Line 123 | add_definitions(-DIBREP)
123   endif(ENABLE_IBREP)
124   if(ENABLE_NUTIL)
125   add_subdirectory(${CADXFEM_PATH}/nutil "${CMAKE_CURRENT_BINARY_DIR}/nutil")
126 < #add_definitions(-DVTK_INTERFACE)
126 > add_definitions(-DVTK_INTERFACE)
127   endif(ENABLE_NUTIL)
128  
129 + if (ENABLE_CAD4FE)
130 + add_definitions(-DUSECAD4FE)
131 + endif(ENABLE_CAD4FE)
132 +
133 + if (ENABLE_CHOIX_TERMINAL_ASTER)
134 + add_definitions(-DCHOIXTERMASTER)
135 + endif(ENABLE_CHOIX_TERMINAL_ASTER)
136 +
137 +
138   message(STATUS "Configuration de MAGiC${annee}:1999-${dateannee}")
139 + message(STATUS "Version de code ASTER integree ${ASTER_VERSION_FLAG}")
140  
141  
142   add_subdirectory(lib)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines