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 951 by couturad, Fri Aug 10 15:17:17 2018 UTC vs.
Revision 987 by francois, Thu Oct 25 16:43:40 2018 UTC

# Line 25 | Line 25 | option(ENABLE_ENGLISH "Magic Use English
25   option(ENABLE_TUTORIEL "Magic turorial" OFF)
26   option(ENABLE_CHOIX_TERMINAL_ASTER "Magic Choix d'un terminal pour executer Code Aster" ON)
27   option(ENABLE_PROJECT_CHRONO "Magic Enable Project_chrono" OFF)
28 + option(ENABLE_PROJECT_POLYCRISTAUX "Magic Enable Project_polycristaux" OFF)
29  
30   message(STATUS "The compiler is ${CMAKE_CXX_COMPILER}.")
31  
# Line 40 | 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")
45   set(ASTER_VERSION_FLAG "12.5" CACHE STRING "Version par défaut de Code ASTER dans la compilation")
46   add_definitions(-DASTER_VERSION_DEFAUT="${ASTER_VERSION_FLAG}")
47   if(ENABLE_OCC_COMPLET)
# Line 106 | Line 108 | if(ENABLE_PROJECT_CHRONO)
108   find_package(Chrono REQUIRED
109               COMPONENTS Irrlicht
110               CONFIG
111 <             HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../project_chrono/chrono-develop/build/cmake)
111 >             HINTS /usr/local/lib64
112 >             )
113   add_definitions(-DPROJECT_CHRONO)            
114   endif(ENABLE_PROJECT_CHRONO)
115  
# Line 144 | Line 147 | add_subdirectory(${CADXFEM_PATH}/nutil "
147   add_definitions(-DVTK_INTERFACE)
148   endif(ENABLE_NUTIL)
149  
150 + if (ENABLE_PROJECT_POLYCRISTAUX)
151 + add_subdirectory(${POLYCRISTAUX_PATH} "${CMAKE_CURRENT_BINARY_DIR}/poly")
152 + add_definitions(-DPROJECT_POLYCRISTAUX)
153 + endif (ENABLE_PROJECT_POLYCRISTAUX)
154 +
155 +
156 +
157 +
158   if (ENABLE_CAD4FE)
159   add_definitions(-DUSECAD4FE)
160   endif(ENABLE_CAD4FE)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines