Merge from V6_main 01/04/2013

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

diff --git a/src/Plot2d/CMakeLists.txt b/src/Plot2d/CMakeLists.txt
index 669455b41e78ca51ad66053c74be848908f14c85..9a9a345c7bba442db43706d6702588ed550fafe9 100755 (executable)
--- a/src/Plot2d/CMakeLists.txt
+++ b/src/Plot2d/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,17 +20,18 @@
 INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
 
 INCLUDE_DIRECTORIES(
-  ${QWT_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
-  ${BOOST_INCLUDE_DIRS}
+  ${QWT_INCLUDE_DIR}
+  ${QT_INCLUDES}
+  ${Boost_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
   ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
 )
 
-SET(COMMON_FLAGS "${QT_DEFINITIONS} ${QWT_DEFINITIONS} ${PYTHON_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
-SET(COMMON_LIBS ${QWT_LIBS} ${QT_MT_LIBS} ${PYTHON_LIBS} suit)
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${QWT_DEFINITIONS} ${PYTHON_DEFINITIONS})
+
+SET(COMMON_LIBS ${QWT_LIBRARY} ${QT_LIBRARIES} ${PYTHON_LIBRARIES} suit)
 
 SET(GUI_HEADERS   
   Plot2d_FitDataDlg.h
@@ -93,7 +94,7 @@ SET(COMMON_HEADERS_H
   Plot2d_SetupCurveScaleDlg.h
 )
 
-IF(ENABLE_PYCONSOLE)
+IF(SALOME_USE_PYCONSOLE)
   SET(COMMON_HEADERS_H
       ${COMMON_HEADERS_H}
       Plot2d_AnalyticalCurve.h
@@ -110,12 +111,11 @@ IF(ENABLE_PYCONSOLE)
       ${GUI_HEADERS}
       Plot2d_AnalyticalCurveDlg.h
   )
-ENDIF(ENABLE_PYCONSOLE)
+ENDIF(SALOME_USE_PYCONSOLE)
 
 QT4_WRAP_CPP(GUI_HEADERS_MOC ${GUI_HEADERS})
 
-ADD_LIBRARY(Plot2d SHARED ${Plot2d_SOURCES} ${GUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(Plot2d PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+ADD_LIBRARY(Plot2d ${Plot2d_SOURCES} ${GUI_HEADERS_MOC})
 TARGET_LINK_LIBRARIES(Plot2d ${COMMON_LIBS})
 INSTALL(TARGETS Plot2d DESTINATION ${GUI_salomelib_LIBS})