X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBuildGUI%2FCMakeLists.txt;h=be81e5d7167571aef266621ceecf7b59d064bb46;hb=25a3dc91508bb59688142bc616b10facc61dfc3d;hp=dcd1e89d25da230ddaddc8c20e37cc61e0722d44;hpb=824e67eabf31204b2bb910e52d7f9e8e1eab140c;p=modules%2Fgeom.git diff --git a/src/BuildGUI/CMakeLists.txt b/src/BuildGUI/CMakeLists.txt old mode 100755 new mode 100644 index dcd1e89d2..be81e5d71 --- a/src/BuildGUI/CMakeLists.txt +++ b/src/BuildGUI/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2021 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,18 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -#INCLUDE(UseQt4Ext) -INCLUDE(${QT_USE_FILE}) +INCLUDE(UseQtExt) # --- options --- # additional include directories INCLUDE_DIRECTORIES( - ${QT_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -46,7 +43,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) @@ -90,12 +87,12 @@ SET(_moc_HEADERS ) # header files / uic wrappings -QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) +QT_WRAP_UIC(_uic_HEADERS ${_uic_files}) # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) SET(BuildGUI_SOURCES BuildGUI.cxx