Merge branch 'V7_dev'

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

diff --git a/src/ObjBrowser/CMakeLists.txt b/src/ObjBrowser/CMakeLists.txt
index e87dea144d2def74fe48bb30c5b05a63a7f04e00..fc201e7248ee79e67232e9b8626678b047bf5afb 100644 (file)
--- a/src/ObjBrowser/CMakeLists.txt
+++ b/src/ObjBrowser/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  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,34 +17,58 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
+# --- options ---
+
+# additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
+  ${PROJECT_SOURCE_DIR}/src/Qtx
 )
 
-SET(GUI_HEADERS OB_Browser.h)
-QT4_WRAP_CPP(GUI_HEADERS ${GUI_HEADERS})
-SET(ObjBrowser_SOURCES
-  OB_Browser.cxx
-)
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+
+# libraries to link to
+SET(_link_LIBRARIES ${QT_LIBRARIES} qtx)
+
+# --- headers ---
+
+# header files / to be processed by moc
+SET(_moc_HEADERS OB_Browser.h)
+
+# header files / no moc processing
+SET(_other_HEADERS OB.h)
+
+# header files / to install
+SET(ObjBrowser_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 
-SET(GUITS_SOURCES
+# --- resources ---
+
+# resource files / to be processed by lrelease
+SET(_ts_RESOURCES
   resources/OB_msg_en.ts
   resources/OB_msg_fr.ts
   resources/OB_msg_ja.ts
 )
 
-ADD_DEFINITIONS(${QT_DEFINITIONS})
+# --- sources ---
+
+# sources / moc wrappings
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / static
+SET(_other_SOURCES OB_Browser.cxx)
 
-ADD_LIBRARY(ObjBrowser ${ObjBrowser_SOURCES} ${GUI_HEADERS})
-TARGET_LINK_LIBRARIES(ObjBrowser qtx ${QT_LIBRARIES})
+# sources / to compile
+SET(ObjBrowser_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
+
+# --- rules ---
+
+ADD_LIBRARY(ObjBrowser ${ObjBrowser_SOURCES})
+TARGET_LINK_LIBRARIES(ObjBrowser ${_link_LIBRARIES})
 INSTALL(TARGETS ObjBrowser EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-SET(COMMON_HEADERS_H
-  OB.h
-  OB_Browser.h
-)
-INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
+INSTALL(FILES ${ObjBrowser_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")