Merge from V6_main 01/04/2013

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

diff --git a/src/SalomeApp/CMakeLists.txt b/src/SalomeApp/CMakeLists.txt
index 0ade4fd050746abbba4ea347176efde0b51e4ce8..3f8042c089c8f89b889cb7a1fdf94442dafaba38 100755 (executable)
--- a/src/SalomeApp/CMakeLists.txt
+++ b/src/SalomeApp/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,23 +20,23 @@
 ADD_SUBDIRECTORY(pluginsdemo)
 
 IF(CPPUNIT_IS_OK)
-  IF(GUI_ENABLE_CORBA)
+  IF(SALOME_USE_CORBA)
     ADD_SUBDIRECTORY(Test)
-  ENDIF(GUI_ENABLE_CORBA)
+  ENDIF(SALOME_USE_CORBA)
 ENDIF(CPPUNIT_IS_OK)
 
 INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
 INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake)
+INCLUDE(${VTK_USE_FILE})
 
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
-  ${VTK_INCLUDE_DIRS}
-  ${QWT_INCLUDE_DIRS}
-  ${BOOST_INCLUDE_DIRS}
+  ${QT_INCLUDES}
+  ${QWT_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
-  ${OMNIORB_INCLUDE_DIRS}
-  ${LIBXML_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIR}
+  ${LIBXML2_INCLUDE_DIR}
   ${PTHREAD_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_SOURCE_DIR}/../LightApp
@@ -58,10 +58,10 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../Prs
 )
 
-SET(COMMON_FLAGS "${QT_DEFINITIONS} ${LIBXML_DEFINITIONS} ${CORBA_DEFINITIONS} ${VTK_DEFINITIONS} ${QWT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+
 SET(COMMON_LIBS 
-  ${PYTHON_LIBS}
-  ${QT_MT_LIBS}
+  ${PYTHON_LIBRARIES}
+  ${QT_LIBRARIES}
   ${OpUtil}
   ${SALOMELocalTrace}
   ${SalomeDSClient}
@@ -99,7 +99,7 @@ SET(GUI_HEADERS
   SalomeApp_ListView.h
   SalomeApp_CheckFileDlg.h
   SalomeApp_ExitDlg.h
-  SalomeApp_NoteBookDlg.h
+  SalomeApp_NoteBook.h
   SalomeApp_DoubleSpinBox.h
   SalomeApp_IntSpinBox.h
 )
@@ -123,7 +123,7 @@ SET(SalomeApp_SOURCES
   SalomeApp_CheckFileDlg.cxx
   SalomeApp_VisualState.cxx
   SalomeApp_ExitDlg.cxx
-  SalomeApp_NoteBookDlg.cxx
+  SalomeApp_NoteBook.cxx
   SalomeApp_DoubleSpinBox.cxx
   SalomeApp_IntSpinBox.cxx
   SalomeApp_Engine_i.cxx
@@ -135,8 +135,9 @@ SET(GUITS_SOURCES
   resources/SalomeApp_msg_fr.ts
 )
 
-ADD_LIBRARY(SalomeApp SHARED ${SalomeApp_SOURCES} ${GUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(SalomeApp PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+ADD_DEFINITIONS(${QT_DEFINITIONS} ${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QWT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS})
+
+ADD_LIBRARY(SalomeApp ${SalomeApp_SOURCES} ${GUI_HEADERS_MOC})
 TARGET_LINK_LIBRARIES(SalomeApp ${COMMON_LIBS})
 INSTALL(TARGETS SalomeApp DESTINATION ${GUI_salomelib_LIBS})
 
@@ -158,7 +159,7 @@ SET(COMMON_HEADERS_H
   SalomeApp_CheckFileDlg.h
   SalomeApp_VisualState.h
   SalomeApp_ExitDlg.h
-  SalomeApp_NoteBookDlg.h
+  SalomeApp_NoteBook.h
   SalomeApp_DoubleSpinBox.h
   SalomeApp_IntSpinBox.h
   SalomeApp_Engine_i.h