Merge from V6_main 28/02/2013

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

diff --git a/src/SUPERVGraph/CMakeLists.txt b/src/SUPERVGraph/CMakeLists.txt
index 2fc8b3f001c4c789585daaf529192cdaa59ba9f0..1140e6dad8923f1b761b576fb111c20b9bc8e852 100755 (executable)
--- a/src/SUPERVGraph/CMakeLists.txt
+++ b/src/SUPERVGraph/CMakeLists.txt
@@ -21,10 +21,10 @@ INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
 
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
+  ${QT_INCLUDES}
   ${BOOST_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
+  ${QT_INCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
   ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
   ${CMAKE_CURRENT_SOURCE_DIR}/../OBJECT
@@ -56,9 +56,10 @@ SET(GUITS_SOURCES
   resources/SUPERVGraph_msg_fr.ts
 )
 
-ADD_LIBRARY(SUPERVGraph SHARED ${SUPERVGraph_SOURCES} ${GUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(SUPERVGraph PROPERTIES COMPILE_FLAGS "${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${PYTHON_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(SUPERVGraph ${QT_MT_LIBS} suit SalomeObject)
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${PYTHON_DEFINITIONS} ${BOOST_DEFINITIONS})
+
+ADD_LIBRARY(SUPERVGraph ${SUPERVGraph_SOURCES} ${GUI_HEADERS_MOC})
+TARGET_LINK_LIBRARIES(SUPERVGraph ${QT_LIBRARIES} suit SalomeObject)
 INSTALL(TARGETS SUPERVGraph DESTINATION ${GUI_salomelib_LIBS})
 
 FILE(GLOB COMMON_HEADERS_H "${CMAKE_CURRENT_SOURCE_DIR}/*.h")