X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMaterial%2FCMakeLists.txt;h=897ec1be39f3202c3f9e87c00561c7160133031d;hb=22d3109060d9acc372bcc3bcfc4b52849b46fb07;hp=c7f0291abcbe94a8622757a3df3cb7eb17bffd6b;hpb=ef007f82d3ac7acc13c4fcd7e92741138a8e5bc8;p=modules%2Fgeom.git diff --git a/src/Material/CMakeLists.txt b/src/Material/CMakeLists.txt old mode 100755 new mode 100644 index c7f0291ab..897ec1be3 --- a/src/Material/CMakeLists.txt +++ b/src/Material/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 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 @@ -17,13 +17,15 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +INCLUDE(UseQtExt) + # --- options --- # additional include directories INCLUDE_DIRECTORIES( - ${VTK_INCLUDE_DIRS} + ${QT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/idl @@ -34,7 +36,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) @@ -43,9 +45,8 @@ ADD_DEFINITIONS( SET(_link_LIBRARIES GEOMObject GEOMClient - ${CAS_TKBRep} + ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} - ${GUI_SalomeApp} ) # --- headers ---