X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=649cf98c0b7ac766fed17fb5cee86f7def5faadf;hb=a1cb9ff04bfb45cfd717b853512de158631e4871;hp=272c1b15920e15444343434b49502887adf480b8;hpb=1b93f1881c5fec599aa79707f93c84dd9c287bc0;p=modules%2Fshaper.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 272c1b159..649cf98c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
-PROJECT (NewGEOM)
-SET (NewGeom_Version 1.4.0)
+PROJECT (SHAPER)
+SET (SHAPER_Version 2.2.0)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 
@@ -15,10 +15,10 @@ INCLUDE(FindSUIT)
 
 IF(UNIX)
   IF(CMAKE_COMPILER_IS_GNUCC)
-    #C++11 is not supported on some platforms, disable it 
+    #C++11 is not supported on some platforms, disable it
     MESSAGE(STATUS "Setting -std=c++0x flag for the gcc...")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-    
+
     #Supporting test coverage checks (gcov) in the DEBUG mode
     IF(USE_TEST_COVERAGE)
       INCLUDE(CodeCoverage)
@@ -26,18 +26,44 @@ IF(UNIX)
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
       SET(CMAKE_SHARED_LINKER_FLAGS "-lgcov")
-      
+
       SETUP_TARGET_FOR_COVERAGE(test_coverage  # Name for custom target.
                                 ctest          # Name of the test driver executable that runs the tests.
                                 coverage)      # Name of output directory.
     ENDIF(USE_TEST_COVERAGE)
-    
+
     #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -E")
     MESSAGE(STATUS "gcc flags are: " ${CMAKE_CXX_FLAGS})
     MESSAGE(STATUS "linker flags are: " ${CMAKE_SHARED_LINKER_FLAGS})
   ENDIF(CMAKE_COMPILER_IS_GNUCC)
 ENDIF(UNIX)
 
+IF(${HAVE_SALOME})
+    SET(SHAPER_INSTALL_ADDONS bin/salome CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_BIN lib/salome CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_PLUGIN_FILES lib/salome CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_PYTHON_API bin/salome CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_PYTHON_FILES bin/salome CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_SWIG bin/salome CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_QM_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_XML_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_GUI_DOC share/doc/salome/gui/SHAPER CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_TUI_DOC share/doc/salome/tui/SHAPER CACHE INTERNAL "" FORCE)
+ELSE(${HAVE_SALOME})
+    SET(SHAPER_INSTALL_ADDONS addons CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_BIN bin CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_PLUGIN_FILES plugins CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_PYTHON_API PythonAPI CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_PYTHON_FILES plugins CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_RESOURCES resources CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_SWIG swig CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_QM_RESOURCES bin CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_XML_RESOURCES plugins CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_GUI_DOC doc CACHE INTERNAL "" FORCE)
+    SET(SHAPER_INSTALL_TUI_DOC doc CACHE INTERNAL "" FORCE)
+ENDIF(${HAVE_SALOME})
+
 #IF(CMAKE_BUILD_TYPE MATCHES Release)
 ADD_SUBDIRECTORY (doc)
 #ENDIF(CMAKE_BUILD_TYPE MATCHES Release)
@@ -53,17 +79,13 @@ ADD_SUBDIRECTORY (src/GeomDataAPI)
 ADD_SUBDIRECTORY (src/PartSetPlugin)
 ADD_SUBDIRECTORY (src/ConstructionPlugin)
 ADD_SUBDIRECTORY (src/FeaturesPlugin)
+ADD_SUBDIRECTORY (src/SamplePanelPlugin)
 ADD_SUBDIRECTORY (src/SketcherPrs)
 ADD_SUBDIRECTORY (src/SketchPlugin)
 ADD_SUBDIRECTORY (src/SketchSolver)
 ADD_SUBDIRECTORY (src/ModuleBase)
 ADD_SUBDIRECTORY (src/PartSet)
 
-IF(NOT ${HAVE_SALOME})
-    ADD_SUBDIRECTORY (src/AppElements)
-    ADD_SUBDIRECTORY (src/GeomApp)
-ENDIF(NOT ${HAVE_SALOME})
-
 ADD_SUBDIRECTORY (src/XGUI)
 ADD_SUBDIRECTORY (src/ExchangePlugin)
 ADD_SUBDIRECTORY (src/GeomValidators)
@@ -73,7 +95,7 @@ ADD_SUBDIRECTORY (src/PythonAddons)
 ADD_SUBDIRECTORY (src/PythonAPI)
 
 IF(${HAVE_SALOME})
-    ADD_SUBDIRECTORY (src/NewGeom)
+    ADD_SUBDIRECTORY (src/SHAPERGUI)
     ADD_SUBDIRECTORY (src/ConnectorPlugin)
 ENDIF(${HAVE_SALOME})