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 987 by francois, Thu Oct 25 16:43:40 2018 UTC vs.
Revision 1019 by francois, Tue Jun 4 21:16:50 2019 UTC

# Line 41 | Line 41 | else()
41   endif()
42  
43   set(CADXFEM_PATH "../cadxfem" CACHE STRING "CADXFEM Path")
44 – set(POLYCRISTAUX_PATH "../poly_occ" CACHE STRING "CADXFEM Path")
44   set(ASTER_VERSION_FLAG "12.5" CACHE STRING "Version par défaut de Code ASTER dans la compilation")
45   add_definitions(-DASTER_VERSION_DEFAUT="${ASTER_VERSION_FLAG}")
46   if(ENABLE_OCC_COMPLET)
# Line 138 | Line 137 | if (ENABLE_ENGLISH)
137   add_definitions(-DUSE_ENGLISH)
138   endif(ENABLE_ENGLISH)
139  
141 – if(ENABLE_IBREP)
142 – add_subdirectory(${CADXFEM_PATH}/IBrep "${CMAKE_CURRENT_BINARY_DIR}/IBrep")
143 – add_definitions(-DIBREP)
144 – endif(ENABLE_IBREP)
140   if(ENABLE_NUTIL)
141   add_subdirectory(${CADXFEM_PATH}/nutil "${CMAKE_CURRENT_BINARY_DIR}/nutil")
142   add_definitions(-DVTK_INTERFACE)
143   endif(ENABLE_NUTIL)
144  
145 + if(ENABLE_IBREP)
146 + add_subdirectory(${CADXFEM_PATH}/IBrep "${CMAKE_CURRENT_BINARY_DIR}/IBrep")
147 + add_definitions(-DIBREP)
148 + endif(ENABLE_IBREP)
149 +
150   if (ENABLE_PROJECT_POLYCRISTAUX)
151 – add_subdirectory(${POLYCRISTAUX_PATH} "${CMAKE_CURRENT_BINARY_DIR}/poly")
151   add_definitions(-DPROJECT_POLYCRISTAUX)
152   endif (ENABLE_PROJECT_POLYCRISTAUX)
153  
# Line 167 | Line 166 | endif(ENABLE_CHOIX_TERMINAL_ASTER)
166   message(STATUS "Configuration de MAGiC${annee}:1999-${dateannee}")
167   message(STATUS "Version de code ASTER integree ${ASTER_VERSION_FLAG}")
168  
169 <
169 > add_subdirectory(outil)
170 > if(ENABLE_PROJECT_POLYCRISTAUX)
171 > add_subdirectory(poly_occ)
172 > endif(ENABLE_PROJECT_POLYCRISTAUX)
173   add_subdirectory(lib)
174   add_subdirectory(app)
175  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines