X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTOOLSGUI%2FCMakeLists.txt;h=d391fc67668282a1c94fc58738feaa673894eae2;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=8a6b024c4b49d47b65f2fe0b3eee159c4680c9e5;hpb=2f00da15280d837f614af0ad848cea1cba83bc02;p=modules%2Fgui.git

diff --git a/src/TOOLSGUI/CMakeLists.txt b/src/TOOLSGUI/CMakeLists.txt
index 8a6b024c4..d391fc676 100755
--- a/src/TOOLSGUI/CMakeLists.txt
+++ b/src/TOOLSGUI/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,51 +17,84 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
+INCLUDE(UseQtExt)
 
+# --- options ---
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
+  ${CAS_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
-  ${CMAKE_BINARY_DIR}/idl
-  ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
-  ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT)
+  ${PTHREAD_INCLUDE_DIR}
+  ${PROJECT_SOURCE_DIR}/src/Qtx
+  ${PROJECT_SOURCE_DIR}/src/SUIT
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+  ${QT_DEFINITIONS}
+  ${CAS_DEFINITIONS}
+  ${BOOST_DEFINITIONS}
+  ${OMNIORB_DEFINITIONS}
+)
 
-SET(COMMON_LIBS
+# libraries to link to
+SET(_link_LIBRARIES
   ${QT_LIBRARIES}
-  suit
   ${CAS_KERNEL}
-  ${SalomeIDLKernel}
-  ${SALOMELocalTrace}
-  ${SalomeNS}
-  ${OpUtil}
-  SalomeIDLGUI
+  ${KERNEL_SalomeIDLKernel}
+  ${KERNEL_SALOMELocalTrace}
+  ${KERNEL_SalomeNS}
+  ${KERNEL_OpUtil}
+  ${OMNIORB_LIBRARIES}
+  qtx suit
 )
 
-SET(GUI_HEADERS ToolsGUI_CatalogGeneratorDlg.h ToolsGUI_RegWidget.h)
-QT4_WRAP_CPP(GUI_HEADERS ${GUI_HEADERS})
-SET(ToolsGUI_SOURCES
-  ToolsGUI_CatalogGeneratorDlg.cxx
-  ToolsGUI_RegWidget.cxx
-  ToolsGUI.cxx
+# --- headers ---
+
+# header files / to be processed by moc
+SET(_moc_HEADERS
+  ToolsGUI_CatalogGeneratorDlg.h
+  ToolsGUI_RegWidget.h
+)
+
+# header files / no moc processing
+SET(_other_HEADERS
+  ToolsGUI.h
 )
 
-SET(GUITS_SOURCES
+# header files / to install
+SET(ToolsGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
+
+# --- resources ---
+
+# resource files / to be processed by lrelease
+SET(_ts_RESOURCES
   resources/ToolsGUI_msg_en.ts
   resources/ToolsGUI_msg_fr.ts
-)
+  resources/ToolsGUI_msg_ja.ts
+) 
+
+# --- sources ---
 
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS}  ${OMNIORB_DEFINITIONS})
+# sources / moc wrappings
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / static
+SET(_other_SOURCES
+  ToolsGUI.cxx
+  ToolsGUI_CatalogGeneratorDlg.cxx
+  ToolsGUI_RegWidget.cxx
+)
 
+# sources / to compile
+SET(ToolsGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
 
-ADD_LIBRARY(ToolsGUI ${ToolsGUI_SOURCES} ${GUI_HEADERS})
-TARGET_LINK_LIBRARIES(ToolsGUI ${COMMON_LIBS})
-INSTALL(TARGETS ToolsGUI DESTINATION ${GUI_salomelib_LIBS})
+# --- rules ---
 
-FILE(GLOB COMMON_HEADERS_H "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${GUI_salomeinclude_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${GUI_salomeres_DATA}")
+ADD_LIBRARY(ToolsGUI ${ToolsGUI_SOURCES})
+TARGET_LINK_LIBRARIES(ToolsGUI ${_link_LIBRARIES})
+INSTALL(TARGETS ToolsGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
+INSTALL(FILES ${ToolsGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")