From 658f510de0893375c4b0e48084119d74a7582008 Mon Sep 17 00:00:00 2001 From: nge Date: Sun, 20 Jan 2013 16:25:29 +0000 Subject: [PATCH] Fix CMake warnings (2 identical targets) + fix SalomePalm link. --- src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt | 4 ++-- src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt index f45baf42a..2f6d9838a 100755 --- a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt @@ -67,8 +67,8 @@ ADD_LIBRARY(CalciumC ${CalciumC_SOURCES}) INSTALL(TARGETS CalciumC DESTINATION ${KERNEL_salomelib_LIBS}) -ADD_EXECUTABLE(test_DataIdContainer test_DataIdContainer.cxx) -TARGET_LINK_LIBRARIES(test_DataIdContainer SalomeDSCSuperv SalomeContainer SalomeCalcium OpUtil SALOMELocalTrace ${OMNIORB_LIBRARIES} ${PLATFORM_LIBS}) +ADD_EXECUTABLE(test_DataIdContainer_Calcium test_DataIdContainer.cxx) +TARGET_LINK_LIBRARIES(test_DataIdContainer_Calcium SalomeDSCSuperv SalomeContainer SalomeCalcium OpUtil SALOMELocalTrace ${OMNIORB_LIBRARIES} ${PLATFORM_LIBS}) CONFIGURE_FILE(calcium_integer_port_uses.hxx.in calcium_integer_port_uses.hxx @ONLY) CONFIGURE_FILE(CalciumProvidesPort.hxx.in CalciumProvidesPort.hxx @ONLY) diff --git a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt index bf17efedb..6a5cacff2 100755 --- a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt @@ -35,9 +35,10 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) ADD_LIBRARY(SalomePalm palm_port_factory.cxx) +TARGET_LINK_LIBRARIES(SalomePalm SalomeDSCSuperv ${OMNIORB_LIBRARIES}) -ADD_EXECUTABLE(test_DataIdContainer test_DataIdContainer.cxx) -TARGET_LINK_LIBRARIES(test_DataIdContainer ${OMNIORB_LIBRARIES}) +ADD_EXECUTABLE(test_DataIdContainer_Palm test_DataIdContainer.cxx) +TARGET_LINK_LIBRARIES(test_DataIdContainer_Palm ${OMNIORB_LIBRARIES}) FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${KERNEL_salomeinclude_HEADERS}) -- 2.39.2