CMake: fixes for MPI and PACO compilation

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcd59b1d0472ae6f7dcc749a8b027495aa5d6174..586f02bbc80e3362ff60101e68d7c19d4e8ecd61 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,8 +32,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-# Temporary backward compatibility:
-SET(VERSION ${${PROJECT_NAME_UC}_VERSION})
+
 SET(VERSION_DEV "0")
 
 # Our own set of macros:
@@ -102,9 +101,6 @@ ENDIF()
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen REQUIRED)
   FIND_PACKAGE(SalomeGraphviz)          # Remains optional even here.
-  
-  # Sphinx needs to run with a specific PYTHONPATH:
-  #SET(SPHINX_PYTHONPATH "${OMNIORBPY_PYTHONPATH}")
   FIND_PACKAGE(SalomeSphinx REQUIRED)
 ENDIF()
 

diff --git a/KERNEL_version.h.in b/KERNEL_version.h.in
index 5a521f400e9377f6f09575254e245b370f86ff12..9fa510c383ca5e96648c8d8d488ddbb5a08b18a3 100644 (file)
--- a/KERNEL_version.h.in
+++ b/KERNEL_version.h.in
@@ -31,7 +31,7 @@
   KERNEL_VERSION is (major << 16) + (minor << 8) + patch.
 */
 
-#define KERNEL_VERSION_STR "@VERSION@"
+#define KERNEL_VERSION_STR "@KERNEL_VERSION@"
 #define KERNEL_VERSION     @XVERSION@
 #define KERNEL_DEVELOPMENT @VERSION_DEV@
 

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 33cd999f03b01c60b740f2b56e034d27b4d2bbdb..2b8a793b046aa3d51072d28508d65764ecefdade 100755 (executable)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -88,7 +88,7 @@ IF(SALOME_PACO_PARALLEL)
     SALOME_PACOExtensionPaCO.idl
     SALOME_GenericObjPaCO.idl
   )
-  OMNIORB_ADD_MODULE(SalomeParallelIDLKernel "${SalomeIDLKernel_IDLSOURCES}" "${IDL_INCLUDE_DIRS}")
+  OMNIORB_ADD_MODULE(SalomeParallelIDLKernel "${SalomeIDLKernel_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" ${TYPE})
   TARGET_LINK_LIBRARIES(SalomeParallelIDLKernel ${OMNIORB_LIBRARIES})
 
   INSTALL(TARGETS SalomeParallelIDLKernel EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})

diff --git a/src/DSC/ParallelDSC/CMakeLists.txt b/src/DSC/ParallelDSC/CMakeLists.txt
index 127bfb29dbb30d3e00b239f7a5a0e02c54b75f48..14c62f33f8916d85c8679ff3c2b501376fbfbcb5 100755 (executable)
--- a/src/DSC/ParallelDSC/CMakeLists.txt
+++ b/src/DSC/ParallelDSC/CMakeLists.txt
@@ -33,6 +33,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_SOURCE_DIR}/src/Registry
   ${PROJECT_SOURCE_DIR}/src/Utils
+  ${PROJECT_BINARY_DIR}/salome_adm
 )
 
 SET(COMMON_FLAGS

diff --git a/src/ParallelContainer/CMakeLists.txt b/src/ParallelContainer/CMakeLists.txt
index a3d8e77e3d196e6ddd9bd85e1bdf687a5c7622c9..390d8d1a8f90a2f31348cae9bf7a81a53ec2eb63 100755 (executable)
--- a/src/ParallelContainer/CMakeLists.txt
+++ b/src/ParallelContainer/CMakeLists.txt
@@ -63,7 +63,7 @@ ADD_DEFINITIONS(${ONMIORB_DEFINITIONS} ${MPI_CXX_COMPILE_FLAGS} ${PACO_DEFINITIO
 
 ADD_LIBRARY(SalomeParallelContainer ${SalomeParallelContainer_SOURCES})
 TARGET_LINK_LIBRARIES(SalomeParallelContainer ${COMMON_LIBS} ${MPI_CXX_LIBRARIES})
-INSTALL(TARGETS Registry EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+INSTALL(TARGETS SalomeParallelContainer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 IF(SALOME_USE_MPI)
   SET(SALOME_ParallelContainerProxyMpi_LIBS
@@ -74,7 +74,7 @@ IF(SALOME_USE_MPI)
     ${MPI_CXX_LIBRARIES}
     ${COMMON_LIBS}
   )
-  ADD_EXECUTABLE(SALOME_ParallelContainerProxyMpi SALOME_Registry_Server.cxx)
+  ADD_EXECUTABLE(SALOME_ParallelContainerProxyMpi SALOME_ParallelContainerProxyMpi.cxx)
   TARGET_LINK_LIBRARIES(SALOME_ParallelContainerProxyMpi ${SALOME_ParallelContainerProxyMpi_LIBS})
 
   ADD_EXECUTABLE(SALOME_ParallelContainerNodeMpi SALOME_ParallelContainerNodeMpi.cxx)