Porting to VTK 6.

[modules/gui.git] / src / TreeData / CMakeLists.txt

diff --git a/src/TreeData/CMakeLists.txt b/src/TreeData/CMakeLists.txt
index d41e6256f8e58e2d4f995b2df50a6e2e5dae5a26..67854cef40e0d57a1f18cf16fbe3fd4ad30d8906 100755 (executable)
--- a/src/TreeData/CMakeLists.txt
+++ b/src/TreeData/CMakeLists.txt
@@ -22,9 +22,9 @@ ADD_SUBDIRECTORY(Test)
 
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
-  ${OMNIORB_INCLUDE_DIRS}
-  ${BOOST_INCLUDE_DIRS}
+  ${QT_INCLUDES}
+  ${OMNIORB_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_SOURCE_DIR}/../SalomeApp
@@ -37,14 +37,13 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../GuiHelpers
 )
 
-SET(COMMON_FLAGS "${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
 
 SET(COMMON_LIBS
-  ${CORBA_LIBS}
-  ${QT_LIBS}
+  ${OMNIORB_LIBRARIES}
+  ${QT_LIBRARIES}
   ${KERNEL_LDFLAGS}
-  ${SalomeLifeCycleCORBA}
-  ${SalomeKernelHelpers}
+  ${KERNEL_SalomeLifeCycleCORBA}
+  ${KERNEL_SalomeKernelHelpers}
   SalomeApp
   LightApp
   suit
@@ -68,8 +67,9 @@ SET(SalomeTreeData_SOURCES
   TreeGuiManager.cxx
 )
 
-ADD_LIBRARY(SalomeTreeData SHARED ${SalomeTreeData_SOURCES} ${GUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(SalomeTreeData PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+ADD_DEFINITIONS(${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+
+ADD_LIBRARY(SalomeTreeData ${SalomeTreeData_SOURCES} ${GUI_HEADERS_MOC})
 TARGET_LINK_LIBRARIES(SalomeTreeData ${COMMON_LIBS})
 INSTALL(TARGETS SalomeTreeData DESTINATION ${GUI_salomelib_LIBS})