Merge from V6_main 11/02/2013

[modules/kernel.git] / src / DSC / DSC_User / Datastream / Palm / CMakeLists.txt

diff --git a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt
index 4976d94df3bc8d9ca6575a6c51db1cc3830d8e1a..6a5cacff2dd8d2c70b86ad39195baf901deb8724 100755 (executable)
--- a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt
+++ b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIR}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User
   ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream
@@ -32,12 +32,13 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_BINARY_DIR}/idl
 )
 
-ADD_LIBRARY(SalomePalm SHARED palm_port_factory.cxx)
-SET_TARGET_PROPERTIES(SalomePalm PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 
-ADD_EXECUTABLE(test_DataIdContainer test_DataIdContainer.cxx)
-SET_TARGET_PROPERTIES(test_DataIdContainer PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(test_DataIdContainer ${OMNIORB_LIBS})
+ADD_LIBRARY(SalomePalm palm_port_factory.cxx)
+TARGET_LINK_LIBRARIES(SalomePalm SalomeDSCSuperv ${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})