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 381 by francois, Sat Dec 8 22:29:43 2012 UTC vs.
Revision 617 by francois, Tue Dec 2 03:11:05 2014 UTC

# Line 3 | Line 3
3   # to the root binary directory of the project as ${HELLO_BINARY_DIR}.
4   cmake_minimum_required (VERSION 2.6 FATAL_ERROR)
5  
6 +
7   if(DEFINED CMAKE_BUILD_TYPE)
8    set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose build type")
9   else(DEFINED CMAKE_BUILD_TYPE)
# Line 15 | Line 16 | 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_IBREP "Magic Enable IBREP" OFF)
19 + option(ENABLE_TOIBREP "Magic Enable TOIBREP" ON)
20   option(ENABLE_NUTIL "Magic Enable NUTIL (pour la visu VTK)" OFF)
21   option(ENABLE_TEST "Magic Enable test" OFF)
22   option(ENABLE_ENGLISH "Magic Use English" OFF)
23 + option(ENABLE_TUTORIEL "Magic turorial" OFF)
24  
25  
26   set(CADXFEM_PATH "../cadxfem" CACHE STRING "CADXFEM Path")
27  
25
28   if(ENABLE_OCC)
29 <  if(WIN32)
28 <    set(OCC_SYS_NAME win32)
29 <  else(WIN32)
30 <    set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
31 <  endif(WIN32)
29 >  set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
30    set(OCC_LIBS_REQUIRED
31        # subset of DataExchange
32        TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
# Line 42 | Line 40 | if(ENABLE_OCC)
40    list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
41    set(OCC_LIBS)
42    foreach(OCC ${OCC_LIBS_REQUIRED})
43 <    find_library(OCC_LIB ${OCC} PATHS ENV CASROOT PATH_SUFFIXES lib
44 <                 ${OCC_SYS_NAME}/lib)
43 >    find_library(OCC_LIB ${OCC} PATHS HINTS ENV CASROOT PATH_SUFFIXES lib
44 >                 ${OCC_SYS_NAME}/lib ${OCC_SYS_NAME}/vc8/lib )
45      if(OCC_LIB)
46        list(APPEND OCC_LIBS ${OCC_LIB})
47      endif(OCC_LIB)
48 <    set(OCC_LIB OCC_LIB-NOTFOUND CACHE INTERNAL "")
49 <    # unset(OCC_LIB CACHE) # cleaner, but only available in cmake >= 2.6.4
48 >    #set(OCC_LIB OCC_LIB-NOTFOUND CACHE INTERNAL "")
49 >    unset(OCC_LIB CACHE) # cleaner, but only available in cmake >= 2.6.4
50    endforeach(OCC)
51    list(LENGTH OCC_LIBS NUM_OCC_LIBS)
52    if(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
53 +    unset(OCC_INC CACHE)
54      find_path(OCC_INC "BRep_Tool.hxx" PATHS ENV CASROOT PATH_SUFFIXES inc
55 <              include opencascade)
55 >              include opencascade include/oce)
56 >
57      if(OCC_INC)
58        add_definitions(-DBREP_OCC)
59        list(APPEND EXTERNAL_LIBRARIES ${OCC_LIBS})
# Line 105 | Line 105 | add_definitions(-DIBREP)
105   endif(ENABLE_IBREP)
106   if(ENABLE_NUTIL)
107   add_subdirectory(${CADXFEM_PATH}/nutil "${CMAKE_CURRENT_BINARY_DIR}/nutil")
108 < add_definitions(-DVTK_INTERFACE)
108 > #add_definitions(-DVTK_INTERFACE)
109   endif(ENABLE_NUTIL)
110  
111   message(STATUS "Configuration de MAGiC${annee}:1999-${dateannee}")
112  
113  
114
114   add_subdirectory(lib)
115   add_subdirectory(app)
116  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines