From aaecc4aa2bbe224d99492ba5404756a007a5f03f Mon Sep 17 00:00:00 2001 From: nge Date: Wed, 13 Feb 2013 09:23:16 +0000 Subject: [PATCH] Add dependencies for parallel compilation : we can depend on corba headers without linking with the idl library. --- src/Communication_SWIG/CMakeLists.txt | 2 ++ src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt | 2 ++ src/NamingService/CMakeLists.txt | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/Communication_SWIG/CMakeLists.txt b/src/Communication_SWIG/CMakeLists.txt index 6741aa09b..49bdecdd4 100755 --- a/src/Communication_SWIG/CMakeLists.txt +++ b/src/Communication_SWIG/CMakeLists.txt @@ -57,5 +57,7 @@ IF(${MACHINE} STREQUAL WINDOWS) SET_TARGET_PROPERTIES(_libSALOME_Comm PROPERTIES DEBUG_OUTPUT_NAME _libSALOME_Comm_d) ENDIF(${MACHINE} STREQUAL WINDOWS) +ADD_DEPENDENCIES(_libSALOME_Comm SalomeIDLKernel) + INSTALL(TARGETS _libSALOME_Comm DESTINATION ${KERNEL_salomepythondir}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libSALOME_Comm.py DESTINATION ${KERNEL_salomepythondir}) diff --git a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt index 6a5cacff2..fecc247bd 100755 --- a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt @@ -32,12 +32,14 @@ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/idl ) + ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) ADD_LIBRARY(SalomePalm palm_port_factory.cxx) TARGET_LINK_LIBRARIES(SalomePalm SalomeDSCSuperv ${OMNIORB_LIBRARIES}) ADD_EXECUTABLE(test_DataIdContainer_Palm test_DataIdContainer.cxx) +ADD_DEPENDENCIES(test_DataIdContainer_Palm SalomeIDLKernel) TARGET_LINK_LIBRARIES(test_DataIdContainer_Palm ${OMNIORB_LIBRARIES}) FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") diff --git a/src/NamingService/CMakeLists.txt b/src/NamingService/CMakeLists.txt index 8859acd39..53cc261e1 100755 --- a/src/NamingService/CMakeLists.txt +++ b/src/NamingService/CMakeLists.txt @@ -33,9 +33,12 @@ SET(SalomeNS_SOURCES NamingService_WaitForServerReadiness.cxx ) + ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) ADD_LIBRARY(SalomeNS ${SalomeNS_SOURCES}) +ADD_DEPENDENCIES(SalomeNS SalomeIDLKernel) TARGET_LINK_LIBRARIES(SalomeNS OpUtil) + INSTALL(TARGETS SalomeNS DESTINATION ${KERNEL_salomelib_LIBS}) # Executable scripts to be installed -- 2.39.2