From 19a2b9a61e42501e9e1aeda133400a39b7f8f1e8 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 24 Nov 2015 12:27:12 +0300 Subject: [PATCH] Minor correction --- adm_local/cmake_files/FindSalomeQt5.cmake | 46 +++++++++++++++++-- src/CAF/CMakeLists.txt | 2 +- src/Event/CMakeLists.txt | 3 ++ src/PVViewer/resources/CMakeLists.txt | 2 - .../SALOME_PYQT_GUILight/CMakeLists.txt | 2 + src/SUITApp/CMakeLists.txt | 2 +- src/SVTK/CMakeLists.txt | 2 +- 7 files changed, 50 insertions(+), 9 deletions(-) diff --git a/adm_local/cmake_files/FindSalomeQt5.cmake b/adm_local/cmake_files/FindSalomeQt5.cmake index 66f491fe9..527fe5438 100644 --- a/adm_local/cmake_files/FindSalomeQt5.cmake +++ b/adm_local/cmake_files/FindSalomeQt5.cmake @@ -33,7 +33,9 @@ SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt5OpenGL Qt5OpenGL_INCLUDE_DIRS SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt5PrintSupport Qt5PrintSupport_INCLUDE_DIRS 1 ENVVAR QT5_ROOT_DIR) SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt5WebKit Qt5WebKit_INCLUDE_DIRS 1 ENVVAR QT5_ROOT_DIR) SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt5WebKitWidgets Qt5WebKitWidgets_INCLUDE_DIRS 1 ENVVAR QT5_ROOT_DIR) -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt5X11Extras Qt5X11Extras_INCLUDE_DIRS 1 ENVVAR QT5_ROOT_DIR) +IF(NOT WIN32) + SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Qt5X11Extras Qt5X11Extras_INCLUDE_DIRS 1 ENVVAR QT5_ROOT_DIR) +ENDIF() get_filename_component(LINGUIST_PATH ${Qt5Core_DIR} DIRECTORY) get_filename_component(LINGUIST_PATH ${LINGUIST_PATH} DIRECTORY) @@ -59,9 +61,45 @@ else(QT_LRELEASE_EXECUTABLE) endif(Linguist_FIND_REQUIRED) endif(QT_LRELEASE_EXECUTABLE) -SET(QT_INCLUDES ${Qt5Core_INCLUDES} ${Qt5Gui_INCLUDES} ${Qt5Widgets_INCLUDES} ${Qt5Network_INCLUDES} ${Qt5Xml_INCLUDES} ${Qt5OpenGL_INCLUDES} ${Qt5PrintSupport_INCLUDES} ${Qt5WebKit_INCLUDES} ${Qt5WebKitWidgets_INCLUDES} ${Qt5X11Extras_INCLUDES}) -SET(QT_DEFINITIONS ${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Xml_DEFINITIONS} ${Qt5OpenGL_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS} ${Qt5WebKit_DEFINITIONS} ${Qt5WebKitWidgets_DEFINITIONS} ${Qt5X11Extras_DEFINITIONS}) -SET(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5WebKit_LIBRARIES} ${Qt5WebKitWidgets_LIBRARIES} ${Qt5X11Extras_LIBRARIES}) +SET(QT_INCLUDES + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Gui_INCLUDE_DIRS} + ${Qt5Widgets_INCLUDE_DIRS} + ${Qt5Network_INCLUDE_DIRS} + ${Qt5Xml_INCLUDE_DIRS} + ${Qt5OpenGL_INCLUDE_DIRS} + ${Qt5PrintSupport_INCLUDE_DIRS} + ${Qt5WebKit_INCLUDE_DIRS} + ${Qt5WebKitWidgets_INCLUDE_DIRS} + ) +SET(QT_DEFINITIONS + ${Qt5Core_DEFINITIONS} + ${Qt5Gui_DEFINITIONS} + ${Qt5Widgets_DEFINITIONS} + ${Qt5Network_DEFINITIONS} + ${Qt5Xml_DEFINITIONS} + ${Qt5OpenGL_DEFINITIONS} + ${Qt5PrintSupport_DEFINITIONS} + ${Qt5WebKit_DEFINITIONS} + ${Qt5WebKitWidgets_DEFINITIONS} + ) +SET(QT_LIBRARIES + ${Qt5Core_LIBRARIES} + ${Qt5Gui_LIBRARIES} + ${Qt5Widgets_LIBRARIES} + ${Qt5Network_LIBRARIES} + ${Qt5Xml_LIBRARIES} + ${Qt5OpenGL_LIBRARIES} + ${Qt5PrintSupport_LIBRARIES} + ${Qt5WebKit_LIBRARIES} + ${Qt5WebKitWidgets_LIBRARIES} + ) + +IF(NOT WIN32) + LIST(APPEND QT_INCLUDES ${Qt5X11Extras_INCLUDE_DIRS}) + LIST(APPEND QT_DEFINITIONS ${Qt5X11Extras_DEFINITIONS}) + LIST(APPEND QT_LIBRARIES ${Qt5X11Extras_LIBRARIES}) +ENDIF() MARK_AS_ADVANCED(LINGUIST_PATH) diff --git a/src/CAF/CMakeLists.txt b/src/CAF/CMakeLists.txt index 4e524d8d5..a34448604 100755 --- a/src/CAF/CMakeLists.txt +++ b/src/CAF/CMakeLists.txt @@ -82,7 +82,7 @@ SET(caf_SOURCES ${_other_SOURCES} ${_moc_SOURCES}) # --- rules --- ADD_LIBRARY(caf ${caf_SOURCES}) -TARGET_LINK_LIBRARIES(caf ${_QT_LIBRARIES} ${_link_LIBRARIES}) +TARGET_LINK_LIBRARIES(caf ${QT_LIBRARIES} ${_link_LIBRARIES}) INSTALL(TARGETS caf EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) INSTALL(FILES ${caf_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/Event/CMakeLists.txt b/src/Event/CMakeLists.txt index 9da467339..8f753936e 100755 --- a/src/Event/CMakeLists.txt +++ b/src/Event/CMakeLists.txt @@ -19,6 +19,9 @@ # --- options --- +# additional include directories +INCLUDE_DIRECTORIES(${QT_INCLUDES}) + # additional preprocessor / compiler flags ADD_DEFINITIONS(${QT_DEFINITIONS}) diff --git a/src/PVViewer/resources/CMakeLists.txt b/src/PVViewer/resources/CMakeLists.txt index 0b1bc7d08..d90f5ed6a 100644 --- a/src/PVViewer/resources/CMakeLists.txt +++ b/src/PVViewer/resources/CMakeLists.txt @@ -17,8 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(UseQtExt) - SET(dist_salomeres_DATA ParaViewFilters.xml ParaViewSources.xml diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt index 8d9f6ed35..183a186b3 100755 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt @@ -17,7 +17,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +INCLUDE(UseQtExt) INCLUDE(UsePyQt) + IF(SALOME_USE_VTKVIEWER) INCLUDE(${VTK_USE_FILE}) ENDIF() diff --git a/src/SUITApp/CMakeLists.txt b/src/SUITApp/CMakeLists.txt index f01da00ca..4da028a4c 100755 --- a/src/SUITApp/CMakeLists.txt +++ b/src/SUITApp/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE(UseQtExt) # additional include directories INCLUDE_DIRECTORIES( - ${QT__INCLUDES} + ${QT_INCLUDES} ${PYTHON_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${PROJECT_BINARY_DIR} diff --git a/src/SVTK/CMakeLists.txt b/src/SVTK/CMakeLists.txt index 5f7694d58..d2a4072e9 100755 --- a/src/SVTK/CMakeLists.txt +++ b/src/SVTK/CMakeLists.txt @@ -42,7 +42,7 @@ ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS}) # libraries to link to SET(_link_LIBRARIES - ${_QT_LIBRARIES} + ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${VTK_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} -- 2.39.2