New CMake procedure.

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

diff --git a/src/Notification/CMakeLists.txt b/src/Notification/CMakeLists.txt
index 571ff7814e1a67aeb1f62a0dc04b7ce4674a37c5..165b00feea42601d5c271566eaeb41043fb8bd30 100755 (executable)
--- a/src/Notification/CMakeLists.txt
+++ b/src/Notification/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -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,11 +39,12 @@ 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})
+INSTALL(TARGETS SalomeNotification DESTINATION ${SALOME_INSTALL_LIBS})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 SET(COMMON_HEADERS ${COMMON_HEADERS_HXX} CosNotifyShorthands.h)
-INSTALL(FILES ${COMMON_HEADERS} DESTINATION ${KERNEL_salomeinclude_HEADERS})
+INSTALL(FILES ${COMMON_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})