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 728 by sattarpa, Tue Sep 15 20:01:11 2015 UTC vs.
Revision 867 by francois, Tue Jan 17 15:44:11 2017 UTC

# Line 25 | Line 25 | option(ENABLE_TUTORIEL "Magic turorial"
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
# Line 38 | Line 52 | if(ENABLE_OCC)
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 121 | Line 136 | 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