X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBasicGUI%2FCMakeLists.txt;h=c521a8c541a06d2daf2d901b3e728638758674a4;hb=c52059c3f88890a936705180edf2bd54e88e160b;hp=4bcb7ed166b1dc8731a84c5b8c602664b5865306;hpb=4e4b3762fc1215eb520840fe65eaeeea0854eff8;p=modules%2Fgeom.git diff --git a/src/BasicGUI/CMakeLists.txt b/src/BasicGUI/CMakeLists.txt old mode 100755 new mode 100644 index 4bcb7ed16..c521a8c54 --- a/src/BasicGUI/CMakeLists.txt +++ b/src/BasicGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2023 CEA, EDF, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,17 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -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 @@ -45,7 +43,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) @@ -94,7 +92,7 @@ SET(_moc_HEADERS # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) SET(BasicGUI_SOURCES BasicGUI.cxx