From c8b7536aa35c3d820b9556ae01f93edd6fa8bdc3 Mon Sep 17 00:00:00 2001 From: bruneton Date: Fri, 19 Jul 2013 08:17:12 +0000 Subject: [PATCH] CMake: fixes for MPI and PACO compilation --- CMakeLists.txt | 6 +----- KERNEL_version.h.in | 2 +- idl/CMakeLists.txt | 2 +- src/DSC/ParallelDSC/CMakeLists.txt | 1 + src/ParallelContainer/CMakeLists.txt | 4 ++-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcd59b1d0..586f02bbc 100755 --- 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 5a521f400..9fa510c38 100644 --- 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 33cd999f0..2b8a793b0 100755 --- 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 127bfb29d..14c62f33f 100755 --- 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 a3d8e77e3..390d8d1a8 100755 --- 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) -- 2.39.2