Migration to OpenCASCADE CMake configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c86a5a6f9cc01e3ca684934898722fe3c398b5a..56b1d24d74a6cc4f5ba4b811e56ce408a3320882 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ ENDIF()
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
   FIND_PACKAGE(SalomeCppUnit)
-  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)  
+  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
 ENDIF()
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
@@ -151,8 +151,8 @@ IF(SALOME_USE_SINGLE_DESKTOP)
   ADD_DEFINITIONS(-DSINGLE_DESKTOP)
 ENDIF()
 
-# OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+# OpenCASCADE
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 
 # OpenGL
 IF(SALOME_USE_OCCVIEWER OR SALOME_USE_VTKVIEWER OR SALOME_USE_GLVIEWER)
@@ -447,7 +447,7 @@ ELSE()
   SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
   SET(PYQT_ROOT_DIR "${PYQT5_ROOT_DIR}")
 ENDIF()
-SET(CAS_ROOT_DIR "${CAS_ROOT_DIR}")
+SET(OPENCASCADE_ROOT_DIR "${OPENCASCADE_ROOT_DIR}")
 SET(OPENGL_ROOT_DIR "${OPENGL_ROOT_DIR}")
 SET(VTK_ROOT_DIR "${VTK_ROOT_DIR}")
 SET(QWT_ROOT_DIR "${QWT_ROOT_DIR}")
@@ -456,16 +456,16 @@ SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/inc
 
 # Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
 IF(NOT SALOME_BUILD_WITH_QT5)
-  SALOME_CONFIGURE_PREPARE(CAS OpenGL Qt4 PyQt4 Qwt SIP VTK)
+  SALOME_CONFIGURE_PREPARE(OpenCASCADE OpenGL Qt4 PyQt4 Qwt SIP VTK)
 ELSE()
-  SALOME_CONFIGURE_PREPARE(CAS OpenGL Qt5 PyQt5 Qwt SIP VTK)
+  SALOME_CONFIGURE_PREPARE(OpenCASCADE OpenGL Qt5 PyQt5 Qwt SIP VTK)
 ENDIF()
 
 CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in 
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
     PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
-       KERNEL_ROOT_DIR SIP_ROOT_DIR QT_ROOT_DIR PYQT_ROOT_DIR CAS_ROOT_DIR 
+       KERNEL_ROOT_DIR SIP_ROOT_DIR QT_ROOT_DIR PYQT_ROOT_DIR OPENCASCADE_ROOT_DIR 
        OPENGL_ROOT_DIR VTK_ROOT_DIR QWT_ROOT_DIR)
 
 #   - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?):
@@ -476,7 +476,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
 #    ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake
 #    INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
 #    PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX 
-#       KERNEL_ROOT_DIR SIP_ROOT_DIR QT_ROOT_DIR PYQT_ROOT_DIR CAS_ROOT_DIR 
+#       KERNEL_ROOT_DIR SIP_ROOT_DIR QT_ROOT_DIR PYQT_ROOT_DIR OPENCASCADE_ROOT_DIR 
 #       OPENGL_ROOT_DIR VTK_ROOT_DIR QWT_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake

diff --git a/SalomeGUIConfig.cmake.in b/SalomeGUIConfig.cmake.in
index a0c97f1438120500b61d9a6c8d3e585df93a68a8..31faede846ba63361bc2e9c040b7db2c4872d076 100644 (file)
--- a/SalomeGUIConfig.cmake.in
+++ b/SalomeGUIConfig.cmake.in
@@ -122,7 +122,7 @@ ELSE()
   SET_AND_CHECK(QT5_ROOT_DIR_EXP "@PACKAGE_QT_ROOT_DIR@")
   SET_AND_CHECK(PYQT5_ROOT_DIR_EXP "@PACKAGE_PYQT_ROOT_DIR@")
 ENDIF()
-SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@")    
+SET_AND_CHECK(OPENCASCADE_ROOT_DIR_EXP "@PACKAGE_OPENCASCADE_ROOT_DIR@")
 
 # Optional level 1 prerequisites:
 IF(SALOME_USE_GLVIEWER)

diff --git a/src/CAF/CMakeLists.txt b/src/CAF/CMakeLists.txt
index 6872baf2c384acf7c3b62cece07a63a5c1da6431..68c03e4ad86af8ed551b4eeb5298632caee7c28b 100755 (executable)
--- a/src/CAF/CMakeLists.txt
+++ b/src/CAF/CMakeLists.txt
@@ -24,17 +24,20 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/SUIT
   ${PROJECT_SOURCE_DIR}/src/STD
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS} ${QT_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} ${CAS_OCAF} ${CAS_OCAFVIS} qtx suit std)
+SET(_link_LIBRARIES ${QT_LIBRARIES} 
+    ${OpenCASCADE_ApplicationFramework_LIBRARIES}
+    ${OpenCASCADE_Visualization_LIBRARIES} 
+    qtx suit std)
 
 # --- headers ---
 

diff --git a/src/CASCatch/CASCatch_CatchSignals.cxx b/src/CASCatch/CASCatch_CatchSignals.cxx
index 9762ed9136c130db6e8fb3b22e0077be3897bb14..9ece89eef0d407e7b9c5e753f3618a6768a117b4 100644 (file)
--- a/src/CASCatch/CASCatch_CatchSignals.cxx
+++ b/src/CASCatch/CASCatch_CatchSignals.cxx
@@ -57,9 +57,6 @@ CASCatch_CatchSignals::CASCatch_CatchSignals()
 #include <OSD_SIGBUS.hxx>
 #include <OSD_SIGSEGV.hxx>
 #include <OSD_SIGSYS.hxx>
-#ifndef LIN
-#include <exception.h>
-#endif
 
 typedef void (ACT_SIGIO_HANDLER)(void) ;
 ACT_SIGIO_HANDLER *ADR_ACT_SIGIO_HANDLER = NULL ;
@@ -80,17 +77,8 @@ typedef void (* SIG_PFV) (int);
 #include <signal.h>
 #include <sys/signal.h>
 
-#ifdef LIN
 # include <stdlib.h>
 # include <stdio.h>
-#else
-# ifdef SA_SIGINFO 
-#   ifndef AIX
-# include <sys/siginfo.h>
-#    endif
-# endif
-#endif
-
 
 #ifdef IRIX
 # include <sigfpe.h>

diff --git a/src/CASCatch/CMakeLists.txt b/src/CASCatch/CMakeLists.txt
index 10434442c4965840c82b621d3a0bdc31b29c4d05..9381a1a1b1ce6da1608943b767d278af55037dae 100755 (executable)
--- a/src/CASCatch/CMakeLists.txt
+++ b/src/CASCatch/CMakeLists.txt
@@ -21,14 +21,14 @@
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${CAS_KERNEL})
+SET(_link_LIBRARIES ${OpenCASCADE_FoundationClasses_LIBRARIES})
 
 # --- headers ---
 

diff --git a/src/DDS/CMakeLists.txt b/src/DDS/CMakeLists.txt
index e41b124b811b8c294436de9adb9da8cf1e51b6be..23d5e7031c4ae6127231addbb732426ee43ffc5d 100755 (executable)
--- a/src/DDS/CMakeLists.txt
+++ b/src/DDS/CMakeLists.txt
@@ -24,14 +24,16 @@
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${CAS_KERNEL} ${CAS_OCAF})
+SET(_link_LIBRARIES 
+    ${OpenCASCADE_FoundationClasses_LIBRARIES}
+    ${OpenCASCADE_ApplicationFramework_LIBRARIES})
 
 # --- headers ---
 

diff --git a/src/GLViewer/CMakeLists.txt b/src/GLViewer/CMakeLists.txt
index 9d0e36c57c3044fd629632512d2a27f053b287f7..be67c0169b3c4a45f0439b350736959c4a58ca96 100755 (executable)
--- a/src/GLViewer/CMakeLists.txt
+++ b/src/GLViewer/CMakeLists.txt
@@ -22,17 +22,17 @@ INCLUDE(UseQtExt)
 # --- options ---
 
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/SUIT
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS} ${QT_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} ${CAS_KERNEL} ${OPENGL_LIBRARIES} qtx suit)
+SET(_link_LIBRARIES ${QT_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES} ${OPENGL_LIBRARIES} qtx suit)
 IF(NOT (WIN32 OR APPLE))
   LIST(APPEND _link_LIBRARIES Xmu)
 ENDIF()

diff --git a/src/GuiHelpers/CMakeLists.txt b/src/GuiHelpers/CMakeLists.txt
index 8e934d4d73f054bc9ada6ff4bf18c71d1eda92c7..6513eb3bc65cbc298e836175dd608da3f50cb93f 100755 (executable)
--- a/src/GuiHelpers/CMakeLists.txt
+++ b/src/GuiHelpers/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -37,7 +37,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${QT_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}

diff --git a/src/LightApp/CMakeLists.txt b/src/LightApp/CMakeLists.txt
index de54a19705659c81979052dd887409832b6f64d5..9a868aa2b31fbae9ab7f4a943048459e2ca8f3c4 100755 (executable)
--- a/src/LightApp/CMakeLists.txt
+++ b/src/LightApp/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${HDF5_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
@@ -88,7 +88,7 @@ IF(SALOME_USE_PYCONSOLE)
 ENDIF()
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${HDF5_DEFINITIONS})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS} ${QT_DEFINITIONS} ${HDF5_DEFINITIONS})
 IF(SALOME_USE_PLOT2DVIEWER)
   ADD_DEFINITIONS(${QWT_DEFINITIONS})
 ENDIF()
@@ -98,7 +98,7 @@ ENDIF()
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${QT_LIBRARIES}
   ${HDF5_LIBRARIES}
   CASCatch qtx suit std SalomeStyle SalomePrs CAM LogWindow ObjBrowser Event 

diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index 4b3b5517e91e11c45a953b02063d37490689139b..fd91687e71047acbd6062a08ae22a5c431482f38 100755 (executable)
--- a/src/OBJECT/CMakeLists.txt
+++ b/src/OBJECT/CMakeLists.txt
@@ -21,15 +21,15 @@
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PROJECT_SOURCE_DIR}/src/ViewerData
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${CAS_LDPATH} ${CAS_KERNEL} ${CAS_TKV3d} ViewerData)
+SET(_link_LIBRARIES ${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_Visualization_LIBRARIES} ViewerData)
 
 # --- headers ---
 

diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt
index 837b6f2c034370fb1338bb6a5288caa6b0810f3e..9774c6263947721197a416fce587cb41ee3c1a80 100755 (executable)
--- a/src/OCCViewer/CMakeLists.txt
+++ b/src/OCCViewer/CMakeLists.txt
@@ -26,7 +26,7 @@ INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${OGL_INCLUDE_DIRS}
   ${QT_INCLUDES}
   ${PTHREAD_INCLUDE_DIR}
@@ -39,12 +39,15 @@ INCLUDE_DIRECTORIES(
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${OpenCASCADE_DEFINITIONS} ${OGL_DEFINITIONS})
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo}
-  ${CAS_TKTopAlgo} ${CAS_TKG2d} ${CAS_TKOpenGl}
+  ${OPENGL_LIBRARIES} ${QT_LIBRARIES}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
+  ${OpenCASCADE_ModelingData_LIBRARIES}
+  ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
+  ${OpenCASCADE_Visualization_LIBRARIES}
   CASCatch qtx suit ViewerTools ViewerData OpenGLUtils
 )
 

diff --git a/src/Prs/CMakeLists.txt b/src/Prs/CMakeLists.txt
index d1b3572aea6105bedf836bccc3874de2257284ea..398ca6ce340244a3b4641dad79b1be0b7e0b0f42 100755 (executable)
--- a/src/Prs/CMakeLists.txt
+++ b/src/Prs/CMakeLists.txt
@@ -19,11 +19,11 @@
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
 # libraries to link to
-SET(_link_LIBRARIES ${CAS_KERNEL})
+SET(_link_LIBRARIES ${OpenCASCADE_FoundationClasses_LIBRARIES})
 
 ADD_LIBRARY(SalomePrs SALOME_Prs.cxx)
 TARGET_LINK_LIBRARIES(SalomePrs ${_link_LIBRARIES})

diff --git a/src/QDS/CMakeLists.txt b/src/QDS/CMakeLists.txt
index 2a6586ced93722a7c3b1e786d83207fa21bdaa2e..ba8258c32591a7efc8964e1301f1453c57ac9472 100755 (executable)
--- a/src/QDS/CMakeLists.txt
+++ b/src/QDS/CMakeLists.txt
@@ -23,17 +23,17 @@ INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/DDS
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${OpenCASCADE_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} ${CAS_KERNEL} qtx DDS)
+SET(_link_LIBRARIES ${QT_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES} qtx DDS)
 
 # --- headers ---
 

diff --git a/src/SALOME_PY/CMakeLists.txt b/src/SALOME_PY/CMakeLists.txt
index cb92ce9bcd062061f75259d76a13af7b81093d4d..59a73c74f9cb9f46e41b59e25e66398c9fd9763f 100755 (executable)
--- a/src/SALOME_PY/CMakeLists.txt
+++ b/src/SALOME_PY/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE(${VTK_USE_FILE})
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${PYTHON_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/CAM
@@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${QT_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
 )
@@ -64,4 +64,4 @@ IF(WIN32)
   SET_TARGET_PROPERTIES(SalomePy PROPERTIES PREFIX "lib" SUFFIX ".pyd" DEBUG_OUTPUT_NAME SalomePy_d RELEASE_OUTPUT_NAME SalomePy)
 ENDIF(WIN32)
 
-# TODO: check if PYTHON_ADD_MODULE() macro can be used to build this target
\ No newline at end of file
+# TODO: check if PYTHON_ADD_MODULE() macro can be used to build this target

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
index ee4db4cc8e0a5328593bac292be8656f1ce84155..f27f2f4b6d0ecbe2eed6f63661a6582adcdf2fad 100755 (executable)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
@@ -26,7 +26,7 @@ ENDIF()
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${PYTHON_INCLUDE_DIRS}
   ${SIP_INCLUDE_DIRS}
@@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
-  ${CAS_DEFINITIONS} 
+  ${OpenCASCADE_DEFINITIONS} 
   ${PYTHON_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
index 90208394d8161b5e5d01f33ec94dcb343a2c41e5..8474c52a52d089dcd7f9aa4184092b3164596cb3 100755 (executable)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
@@ -28,7 +28,7 @@ ENDIF()
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${PYTHON_INCLUDE_DIRS}
   ${SIP_INCLUDE_DIR}
@@ -54,7 +54,7 @@ ENDIF()
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
 )
 

diff --git a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
index 041fa5beefbb52e0037b4cf8ecff9b1b529eb466..972be3f7ab295acc8e67cd98a2f7afb7a62ecdc5 100755 (executable)
--- a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
+++ b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
@@ -27,7 +27,7 @@ ENDIF()
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${QWT_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
@@ -78,7 +78,7 @@ ENDIF(SALOME_LIGHT_ONLY)
 ADD_DEFINITIONS(
   ${QWT_DEFINITIONS}
   ${QT_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}

diff --git a/src/SALOME_SWIG/CMakeLists.txt b/src/SALOME_SWIG/CMakeLists.txt
index c68378d4b035a0a284af8b0bf120a56acaa1837c..855518d6b7cbf76a9f08e15ac319d3628daa15a4 100755 (executable)
--- a/src/SALOME_SWIG/CMakeLists.txt
+++ b/src/SALOME_SWIG/CMakeLists.txt
@@ -27,7 +27,7 @@ ENDIF()
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${QWT_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -53,7 +53,7 @@ SET_SOURCE_FILES_PROPERTIES(libSALOME_Swig.i PROPERTIES SWIG_DEFINITIONS "-shado
 SET_SOURCE_FILES_PROPERTIES(libSALOME_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H")
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${QWT_DEFINITIONS} ${CAS_DEFINITIONS} ${PYTHON_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${QWT_DEFINITIONS} ${OpenCASCADE_DEFINITIONS} ${PYTHON_DEFINITIONS})
 
 # --- headers ---
 

diff --git a/src/SOCC/CMakeLists.txt b/src/SOCC/CMakeLists.txt
index 8de68d550a7a342874c709cd5cc2cdd63580773f..511f90bae73dac36dbdcc6bfd1aa5f5fd5c6729d 100755 (executable)
--- a/src/SOCC/CMakeLists.txt
+++ b/src/SOCC/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/SUIT
@@ -34,11 +34,11 @@ INCLUDE_DIRECTORIES(
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${OpenCASCADE_DEFINITIONS} ${OGL_DEFINITIONS})
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER}
+  ${QT_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_Visualization_LIBRARIES}
   qtx suit SalomeObject SalomePrs OCCViewer
 )
 

diff --git a/src/SPlot2d/CMakeLists.txt b/src/SPlot2d/CMakeLists.txt
index 04818d747637605e32005e40cd0130ab6bcf5d0e..d010927984aeb16b9d4bd093842f7957fc87eee4 100755 (executable)
--- a/src/SPlot2d/CMakeLists.txt
+++ b/src/SPlot2d/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${QWT_INCLUDE_DIR}
   ${PROJECT_SOURCE_DIR}/src/Qtx
@@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES(
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${QWT_DEFINITIONS} ${CAS_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${QWT_DEFINITIONS} ${OpenCASCADE_DEFINITIONS})
 
 # libraries to link to
 SET(_link_LIBRARIES ${QT_LIBRARIES} ${QWT_LIBRARY} qtx suit Plot2d SalomePrs SalomeObject)

diff --git a/src/SVTK/CMakeLists.txt b/src/SVTK/CMakeLists.txt
index 611319e1444e8bbd0380b036fd1839fd8b26177e..3a348ab9e9d5b9d09ea50962ed096a8565fc7678 100755 (executable)
--- a/src/SVTK/CMakeLists.txt
+++ b/src/SVTK/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE(${VTK_USE_FILE})
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
@@ -38,14 +38,14 @@ INCLUDE_DIRECTORIES(
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS})
 
 # libraries to link to
 SET(_link_LIBRARIES 
   ${QT_LIBRARIES}
   ${OPENGL_LIBRARIES}
   ${VTK_LIBRARIES}
-  ${CAS_KERNEL} ${CAS_VIEWER}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_Visualization_LIBRARIES}
   ${KERNEL_OpUtil}
   qtx suit ViewerTools SalomeObject SalomePrs VTKViewer OpenGLUtils
 )

diff --git a/src/SalomeApp/CMakeLists.txt b/src/SalomeApp/CMakeLists.txt
index d65ba0b38f2ad862a34100d2819091114cf510bb..bb243e603cfcfd16a3de2ba9edc73f79da3489cc 100755 (executable)
--- a/src/SalomeApp/CMakeLists.txt
+++ b/src/SalomeApp/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF()
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${QWT_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
@@ -66,7 +66,7 @@ ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${QWT_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
 )
 
@@ -76,7 +76,7 @@ ENDIF()
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${QT_LIBRARIES}
   ${PYTHON_LIBRARIES}
   ${KERNEL_OpUtil} ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeDSClient} ${KERNEL_TOOLSDS}

diff --git a/src/Session/CMakeLists.txt b/src/Session/CMakeLists.txt
index 301c927e23a7e011c16c2c416bbe48b98fd08ae7..477800cdc0fc9148466e196eda3e85196217c706 100755 (executable)
--- a/src/Session/CMakeLists.txt
+++ b/src/Session/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
   ${Boost_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}
@@ -46,14 +46,14 @@ ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${PYTHON_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
   ${QT_LIBRARIES}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${OMNIORB_LIBRARIES}
   ${KERNEL_SalomeNS}
   ${KERNEL_SalomeLifeCycleCORBA}

diff --git a/src/TOOLSGUI/CMakeLists.txt b/src/TOOLSGUI/CMakeLists.txt
index d391fc67668282a1c94fc58738feaa673894eae2..8bac12d305ca251990d70e39dd4ab1906191debe 100755 (executable)
--- a/src/TOOLSGUI/CMakeLists.txt
+++ b/src/TOOLSGUI/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE(UseQtExt)
 # --- options ---
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
@@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
 )
@@ -41,7 +41,7 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${QT_LIBRARIES}
-  ${CAS_KERNEL}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${KERNEL_SalomeIDLKernel}
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SalomeNS}

diff --git a/src/TreeData/CMakeLists.txt b/src/TreeData/CMakeLists.txt
index 9a91e55fe2cbf96161c41b12f76d53f9c6d4cc1b..5a173b205d0d31e4a92e8abafb50a3d94a06a832 100755 (executable)
--- a/src/TreeData/CMakeLists.txt
+++ b/src/TreeData/CMakeLists.txt
@@ -25,7 +25,6 @@ ADD_SUBDIRECTORY(Test)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
   ${OMNIORB_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
@@ -42,7 +41,6 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
   ${QT_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}

diff --git a/src/VTKViewer/CMakeLists.txt b/src/VTKViewer/CMakeLists.txt
index 7d0d468e2ab2562eb5f487ed441b97205cd1102f..ea46d03b27c66bdb6def84e55ef687a48ffcf220 100755 (executable)
--- a/src/VTKViewer/CMakeLists.txt
+++ b/src/VTKViewer/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${QT_INCLUDES}
   ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_SOURCE_DIR}/src/Qtx
@@ -32,10 +32,10 @@ INCLUDE_DIRECTORIES(
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS} ${QT_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${VTK_LIBRARIES} ${CAS_KERNEL} qtx suit ${KERNEL_SALOMELocalTrace})
+SET(_link_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${VTK_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES} qtx suit ${KERNEL_SALOMELocalTrace})
 
 # --- headers ---
 

diff --git a/src/ViewerData/CMakeLists.txt b/src/ViewerData/CMakeLists.txt
index 8e2128531e63b642c42e4a8577e5abb46c01ac32..12c41d2d2ad1d7d1e6c71827dcdba852c780507c 100644 (file)
--- a/src/ViewerData/CMakeLists.txt
+++ b/src/ViewerData/CMakeLists.txt
@@ -21,14 +21,16 @@
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
 # additional preprocessor / compiler flags
-ADD_DEFINITIONS(${CAS_DEFINITIONS})
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS})
 
 # libraries to link to
-SET(_link_LIBRARIES ${CAS_LDPATH} ${CAS_KERNEL} ${CAS_VIEWER})
+SET(_link_LIBRARIES 
+    ${OpenCASCADE_FoundationClasses_LIBRARIES}
+    ${OpenCASCADE_Visualization_LIBRARIES})
 
 # --- headers ---