Merge from V6_main 28/02/2013

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

diff --git a/src/SPlot2d/CMakeLists.txt b/src/SPlot2d/CMakeLists.txt
index 3c7cc70645fa3f17c66a9094c04e206245a1f4f4..70f4c26c7a508534f9faa2ddbdbd317650778d9c 100755 (executable)
--- a/src/SPlot2d/CMakeLists.txt
+++ b/src/SPlot2d/CMakeLists.txt
@@ -19,9 +19,9 @@
 
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
+  ${QT_INCLUDES}
   ${BOOST_INCLUDE_DIRS}
-  ${QWT_INCLUDE_DIRS}
+  ${QWT_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
@@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../OBJECT
 )
 
-SET(COMMON_FLAGS "${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${QWT_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+ADD_DEFINITIONS("${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${QWT_DEFINITIONS}")
 SET(COMMON_LIBS suit Plot2d SalomePrs SalomeObject)
 
 SET(GUI_HEADERS   
@@ -48,8 +48,7 @@ SET(SPlot2d_SOURCES
   SPlot2d_ViewWindow.cxx
 )
 
-ADD_LIBRARY(SPlot2d SHARED ${SPlot2d_SOURCES} ${GUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(SPlot2d PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+ADD_LIBRARY(SPlot2d ${SPlot2d_SOURCES} ${GUI_HEADERS_MOC})
 TARGET_LINK_LIBRARIES(SPlot2d ${COMMON_LIBS})
 INSTALL(TARGETS SPlot2d DESTINATION ${GUI_salomelib_LIBS})