Merge from V6_main 11/02/2013

[modules/kernel.git] / src / Notification / CMakeLists.txt

diff --git a/src/Notification/CMakeLists.txt b/src/Notification/CMakeLists.txt
index 571ff7814e1a67aeb1f62a0dc04b7ce4674a37c5..e143f759eeff2d057c16bc0e75e09e3fca904ab7 100755 (executable)
--- a/src/Notification/CMakeLists.txt
+++ b/src/Notification/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
@@ -30,7 +30,7 @@ SET(COMMON_LIBS
   OpUtil
   SALOMELocalTrace
   SALOMEBasics
-  ${OMNIORB_LIBS}
+  ${OMNIORB_LIBRARIES}
 )
 
 SET(SalomeNotification_SOURCES
@@ -39,8 +39,9 @@ SET(SalomeNotification_SOURCES
   NOTIFICATION_Consumer.cxx
 )
 
-ADD_LIBRARY(SalomeNotification SHARED ${SalomeNotification_SOURCES}) 
-SET_TARGET_PROPERTIES(SalomeNotification PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS})
+
+ADD_LIBRARY(SalomeNotification ${SalomeNotification_SOURCES}) 
 TARGET_LINK_LIBRARIES(SalomeNotification ${COMMON_LIBS})
 INSTALL(TARGETS SalomeNotification DESTINATION ${KERNEL_salomelib_LIBS})