Merge from V6_main 28/02/2013

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

diff --git a/src/SVTK/CMakeLists.txt b/src/SVTK/CMakeLists.txt
index de49ce5cd93f5ca170b8d132e2f1026b4b756a76..90a85743eb01625fcd0d5a21406e4d4ccd848c1b 100755 (executable)
--- a/src/SVTK/CMakeLists.txt
+++ b/src/SVTK/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
 
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
+  ${QT_INCLUDES}
   ${VTK_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${BOOST_INCLUDE_DIRS}
@@ -35,7 +35,9 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../VTKViewer
   ${CMAKE_CURRENT_SOURCE_DIR}/../OpenGLUtils
 )
-SET(COMMON_FLAGS "${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${VTK_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${VTK_DEFINITIONS} ${BOOST_DEFINITIONS})
+
 SET(COMMON_LIBS
   qtx
   suit
@@ -44,11 +46,11 @@ SET(COMMON_LIBS
   SalomePrs
   VTKViewer
   OpenGLUtils
-  ${SALOMELocalTrace}
-  ${OpUtil}
-  ${VTK_LIBS}
-  ${OGL_LIBS}
-  ${QT_MT_LIBS}
+  ${KERNEL_SALOMELocalTrace}
+  ${KERNEL_OpUtil}
+  ${VTK_LIBRARIES}
+  ${OPENGL_LIBRARIES}
+  ${QT_LIBRARIES}
   ${CAS_KERNEL}
   ${CAS_VIEWER}
 )
@@ -102,8 +104,7 @@ SET(GUITS_SOURCES
   resources/SVTK_images.ts
 )
 
-ADD_LIBRARY(SVTK SHARED ${SVTK_SOURCES} ${GUI_HEADERS})
-SET_TARGET_PROPERTIES(SVTK PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+ADD_LIBRARY(SVTK ${SVTK_SOURCES} ${GUI_HEADERS})
 TARGET_LINK_LIBRARIES(SVTK ${COMMON_LIBS})
 INSTALL(TARGETS SVTK DESTINATION ${GUI_salomelib_LIBS})