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 726 by francois, Fri Sep 11 14:19:44 2015 UTC vs.
Revision 865 by francois, Wed Jan 11 19:33:47 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 + 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)
# Line 38 | Line 51 | if(ENABLE_OCC)
51        # ModelingData
52        TKBRep TKGeomBase TKG3d TKG2d
53        # FoundationClasses
54 <      TKAdvTools TKMath TKernel)
54 >      #TKAdvTools
55 >      TKMath TKernel)
56    list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
57    set(OCC_LIBS)
58    foreach(OCC ${OCC_LIBS_REQUIRED})
# Line 117 | Line 131 | endif(ENABLE_CAD4FE)
131  
132   if (ENABLE_CHOIX_TERMINAL_ASTER)
133   add_definitions(-DCHOIXTERMASTER)
134 < endif(ENABLE_CAD4FE)
134 > endif(ENABLE_CHOIX_TERMINAL_ASTER)
135  
136  
137   message(STATUS "Configuration de MAGiC${annee}:1999-${dateannee}")

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines