Merge from V6_main 11/02/2013

[modules/paravis.git] / src / PVGUI / CMakeLists.txt

diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt
index 514e768635de924eeb5f0565a98494aa269a9508..d729a8c8e5763b6bd8ba22cc49772c61bb34bff3 100644 (file)
--- a/src/PVGUI/CMakeLists.txt
+++ b/src/PVGUI/CMakeLists.txt
@@ -21,7 +21,7 @@ SET(VERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MAINTENANCE})
 SET(SOVERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR})
 
 ADD_DEFINITIONS(-DHAVE_SALOME_CONFIG)
-INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../ParaView ${CMAKE_BINARY_DIR}/idl ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../ParaView ${CMAKE_BINARY_DIR}/idl ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
 IF(WITH_VISU)
   SET(VISU_PARAVIS_LIBS
@@ -115,8 +115,7 @@ SET(libPARAVIS_la_CPPFLAGS
   ${CAS_CPPFLAGS}
   ${CAS_CXXFLAGS}
   ${KERNEL_CXXFLAGS}
-  ${CORBA_CXXFLAGS}
-  ${CORBA_INCLUDES}
+  ${OMNIORB_DEFINITIONS}
   ${BOOST_CPPFLAGS}
   ${GUI_CXXFLAGS}
   ${MED_CXXFLAGS}
@@ -158,7 +157,7 @@ SET_TARGET_PROPERTIES(PARAVIS PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOV
 
 TARGET_LINK_LIBRARIES(PARAVIS 
   ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS}
-  ${CORBA_LIBS}
+  ${OMNIORB_LIBRARIES}
   ${QT_LIBS}
   ${CAS_KERNEL}
   ${VTK_LIBS}