Merge remote-tracking branch 'remotes/origin/master' into SolveSpace

[modules/shaper.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f7435c67349d720898009651113ecc4b797faae..bef4cdee832db553cbc8fc76202f5bfcf6f52b3b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ INCLUDE(FindQt)
 INCLUDE(FindBoost)
 INCLUDE(FindPython)
 INCLUDE(FindSalome)
+INCLUDE(FindSolveSpace)
 
 IF(UNIX)
     IF(CMAKE_COMPILER_IS_GNUCC)
@@ -16,19 +17,23 @@ IF(UNIX)
         MESSAGE(STATUS "Setting -std=c++0x flag for the gcc...")
         MESSAGE(STATUS "Now gcc flags are: " ${CMAKE_CXX_FLAGS})
         
+       SET(CMAKE_SHARED_LINKER_FLAGS "${SMAKE_SHARED_LINKER_FLAGS} -Wl,-E")
     ENDIF(CMAKE_COMPILER_IS_GNUCC)
 ENDIF(UNIX)
 
 
 ADD_SUBDIRECTORY (src/Config)
-ADD_SUBDIRECTORY (src/Event)
+ADD_SUBDIRECTORY (src/Events)
 ADD_SUBDIRECTORY (src/Model)
 ADD_SUBDIRECTORY (src/ModelAPI)
 ADD_SUBDIRECTORY (src/GeomAPI)
 ADD_SUBDIRECTORY (src/GeomAlgoAPI)
+ADD_SUBDIRECTORY (src/GeomData)
+ADD_SUBDIRECTORY (src/GeomDataAPI)
 ADD_SUBDIRECTORY (src/PartSetPlugin)
 ADD_SUBDIRECTORY (src/ConstructionPlugin)
 ADD_SUBDIRECTORY (src/SketchPlugin)
+ADD_SUBDIRECTORY (src/SketchSolver)
 ADD_SUBDIRECTORY (src/ModuleBase)
 ADD_SUBDIRECTORY (src/PartSet)
 ADD_SUBDIRECTORY (src/PyConsole)
@@ -37,6 +42,6 @@ ADD_SUBDIRECTORY (src/PyInterp)
 ADD_SUBDIRECTORY (src/XGUI)
 ADD_SUBDIRECTORY (src/GeomApp)
 
-#IF(${HAVE_SALOME})
-#      ADD_SUBDIRECTORY (src/SalomeModule)
-#ENDIF(${HAVE_SALOME})
+IF(${HAVE_SALOME})
+       ADD_SUBDIRECTORY (src/NewGeom)
+ENDIF(${HAVE_SALOME})