X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMBase%2FCMakeLists.txt;h=fe30e1f8c5dfff53e346b4c47ca93eab4fbe1516;hb=bbafce4b04731f9219f75dc124ec2429d994c202;hp=f3cc03f2680687e6f43bce97e4d87b7998674515;hpb=5e3080a50e2ddb3beb564c81d4b8b5aa62fe86e3;p=modules%2Fgeom.git diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt old mode 100755 new mode 100644 index f3cc03f26..fe30e1f8c --- a/src/GEOMBase/CMakeLists.txt +++ b/src/GEOMBase/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2024 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 @@ -43,7 +41,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) @@ -56,7 +54,6 @@ SET(_link_LIBRARIES GEOM DlgRef ${KERNEL_SALOMELocalTrace} - ${GUI_SalomeApp} ) # --- headers --- @@ -80,7 +77,7 @@ SET(_moc_HEADERS # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) SET(GEOMBase_SOURCES GEOMBase.cxx