Last updates & add missing files.

diff --git a/cmake/FindCAS.cmake b/cmake/FindCAS.cmake
index ce24f3d589e15e7fdadd2b047cb8c1f24f0f1335..dc46f0c10891a95b7c0d518b676048e7f7acdb5c 100644 (file)
--- a/cmake/FindCAS.cmake
+++ b/cmake/FindCAS.cmake
@@ -80,7 +80,11 @@ IF(NOT WIN32)
   ENDIF()
 ENDIF()
 
-FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin PATH_SUFFIXES lib lin64/gcc/lib bin)
+IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
+  FIND_LIBRARY(CAS_FWOSPlugin FWOSPlugin PATH_SUFFIXES lib lin64/gcc/lib bin)
+ELSE()
+  FIND_LIBRARY(CAS_TKStd TKStd PATH_SUFFIXES lib lin64/gcc/lib bin)
+ENDIF()
 FIND_LIBRARY(CAS_TKBin TKBin PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKBinL TKBinL PATH_SUFFIXES lib lin64/gcc/lib bin)
 FIND_LIBRARY(CAS_TKBinTObj TKBinTObj PATH_SUFFIXES lib lin64/gcc/lib bin)
@@ -164,7 +168,6 @@ SET(CAS_TKSTL ${CAS_TKSTL_EA})
 SET(CAS_TKCAF ${CAS_TKCAF_EA})
 
 SET(_libs
-  CAS_FWOSPlugin
   CAS_TKBin
   CAS_TKBinL
   CAS_TKBinTObj
@@ -212,6 +215,12 @@ SET(_libs
   CAS_TKXSBase
 )
 
+IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
+  LIST(APPEND _libs CAS_FWOSPlugin)
+ELSE()
+  LIST(APPEND _libs CAS_TKStd)
+ENDIF()
+
 IF(CAS_VERSION_STR VERSION_LESS "6.9.1")
   LIST(APPEND _libs CAS_TKNIS)
 ENDIF()

diff --git a/cmake/FindKERNEL.cmake b/cmake/FindKERNEL.cmake
new file mode 100644 (file)
index 0000000..22d1b01
--- /dev/null
+++ b/cmake/FindKERNEL.cmake
@@ -0,0 +1,69 @@
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+#
+#  TODO: this file should be removed when switching to full CMake
+#
+
+SET(KERNEL_CXXFLAGS -I${KERNEL_ROOT_DIR}/include/salome) # to be removed
+SET(KERNEL_INCLUDE_DIRS ${KERNEL_ROOT_DIR}/include/salome)
+
+FIND_LIBRARY(KERNEL_CalciumC CalciumC ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_DF DF ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_Launcher Launcher ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_LifeCycleCORBATest LifeCycleCORBATest ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_NamingServiceTest NamingServiceTest ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_OpUtil OpUtil ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_Registry Registry ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_ResourcesManager ResourcesManager ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SALOMEBasics SALOMEBasics ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeCatalog SalomeCatalog ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeCommunication SalomeCommunication ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeContainer SalomeContainer ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeDatastream SalomeDatastream ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeDSCContainer SalomeDSCContainer ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeDSClient SalomeDSClient ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeDSCSupervBasic SalomeDSCSupervBasic ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeDSCSuperv SalomeDSCSuperv ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeDSImpl SalomeDSImpl ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SALOMEDSImplTest SALOMEDSImplTest ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeDS SalomeDS ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SALOMEDSTest SALOMEDSTest ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeGenericObj SalomeGenericObj ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeHDFPersist SalomeHDFPersist ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeIDLKernel SalomeIDLKernel ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeLauncher SalomeLauncher ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeLifeCycleCORBA SalomeLifeCycleCORBA ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SALOMELocalTrace SALOMELocalTrace ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SALOMELocalTraceTest SALOMELocalTraceTest ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeLoggerServer SalomeLoggerServer ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeMPIContainer SalomeMPIContainer ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeNotification SalomeNotification ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeNS SalomeNS ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeResourcesManager SalomeResourcesManager ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeTestComponentEngine SalomeTestComponentEngine ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeTestMPIComponentEngine SalomeTestMPIComponentEngine ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SALOMETraceCollectorTest SALOMETraceCollectorTest ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_TOOLSDS TOOLSDS ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_UtilsTest UtilsTest ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_with_loggerTraceCollector with_loggerTraceCollector ${KERNEL_ROOT_DIR}/lib/salome)
+FIND_LIBRARY(KERNEL_SalomeKernelHelpers SalomeKernelHelpers ${KERNEL_ROOT_DIR}/lib/salome)

diff --git a/cmake/FindMESHGEMS.cmake b/cmake/FindMESHGEMS.cmake
index 079f0c3b49a80595ef035f75386229b9e4a24caf..2e62b45608d29a718de79a7941866292db477550 100644 (file)
--- a/cmake/FindMESHGEMS.cmake
+++ b/cmake/FindMESHGEMS.cmake
@@ -48,13 +48,11 @@ ELSE()
 ENDIF(WIN32)
 
 FIND_LIBRARY(MESHGEMS_LIBRARY_mg-cadsurf NAMES mg-cadsurf PATH_SUFFIXES ${_plt})
-FIND_LIBRARY(MESHGEMS_LIBRARY_mg-precad NAMES mg-precad PATH_SUFFIXES ${_plt})
 FIND_LIBRARY(MESHGEMS_LIBRARY_meshgems NAMES meshgems PATH_SUFFIXES ${_plt})
 
 # TODO: search all components
 SET(MESHGEMS_LIBRARIES)
 SET(MESHGEMS_LIBRARIES ${MESHGEMS_LIBRARIES} ${MESHGEMS_LIBRARY_mg-cadsurf})
-SET(MESHGEMS_LIBRARIES ${MESHGEMS_LIBRARIES} ${MESHGEMS_LIBRARY_mg-precad})
 IF(MESHGEMS_LIBRARY_meshgems)
   SET(MESHGEMS_LIBRARIES ${MESHGEMS_LIBRARIES} ${MESHGEMS_LIBRARY_meshgems})
 ENDIF(MESHGEMS_LIBRARY_meshgems)

diff --git a/cmake/FindSalomeCAS.cmake b/cmake/FindSalomeCAS.cmake
old mode 100644 (file)
new mode 100755 (executable)
index 186df6c..f1c843c
--- a/cmake/FindSalomeCAS.cmake
+++ b/cmake/FindSalomeCAS.cmake
@@ -26,7 +26,7 @@
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(CAS CAS_INCLUDE_DIRS 1)
 MARK_AS_ADVANCED(CAS_INCLUDE_DIRS
-  CAS_BinLPlugin CAS_BinTObjPlugin   CAS_BinXCAFPlugin CAS_FWOSPlugin CAS_PTKernel
+  CAS_BinLPlugin CAS_BinTObjPlugin   CAS_BinXCAFPlugin CAS_PTKernel
   CAS_StdLPlugin CAS_StdPlugin CAS_TKAdvTools  CAS_TKBin   CAS_TKBinL    CAS_TKBinTObj   
   CAS_TKBinXCAF   CAS_TKBO    CAS_TKBool    CAS_TKBRep    CAS_TKCAF   CAS_TKCDF   CAS_TKernel   
   CAS_TKFeat    CAS_TKFillet    CAS_TKG2d   CAS_TKG3d   CAS_TKGeomAlgo    CAS_TKGeomBase    
@@ -38,12 +38,17 @@ MARK_AS_ADVANCED(CAS_INCLUDE_DIRS
   CAS_TKXmlXCAF   CAS_TKXSBase    CAS_XCAFPlugin    CAS_XmlLPlugin    CAS_XmlPlugin   CAS_XmlTObjPlugin   
   CAS_XmlXCAFPlugin CAS_Xmu)
 
+IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
+  MARK_AS_ADVANCED(CAS_FWOSPlugin)
+ELSE()
+  MARK_AS_ADVANCED(CAS_TKStd)
+ENDIF()
 
 IF(CAS_VERSION_STR VERSION_LESS "7.0")
   SET(CAS_STDPLUGIN TKStdSchema)
 ELSE()
   SET(CAS_STDPLUGIN TKStd)
-  SET(CAS_BINPLUGIN TKBin)\r
+  SET(CAS_BINPLUGIN TKBin)
 ENDIF()
 
 IF(CAS_FOUND)

diff --git a/cmake/FindSalomeJOBMANAGER.cmake b/cmake/FindSalomeJOBMANAGER.cmake
new file mode 100644 (file)
index 0000000..8a9b4cf
--- /dev/null
+++ b/cmake/FindSalomeJOBMANAGER.cmake
@@ -0,0 +1,34 @@
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+IF(NOT SalomeJOBMANAGER_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for Salome JOBMANAGER ...")
+ENDIF()
+
+SET(CMAKE_PREFIX_PATH "${JOBMANAGER_ROOT_DIR}")
+
+SALOME_FIND_PACKAGE(SalomeJOBMANAGER SalomeJOBMANAGER CONFIG)
+
+IF(NOT SalomeJOBMANAGER_FIND_QUIETLY)
+  MESSAGE(STATUS "Found Salome JOBMANAGER: ${JOBMANAGER_ROOT_DIR}")
+ENDIF()
+
+FOREACH(_res ${SalomeJOBMANAGER_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeJOBMANAGER_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file