X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMToolsGUI%2FCMakeLists.txt;h=9556cfd6cc24a80a0a04a52ded22cd776a21d76c;hb=22d3109060d9acc372bcc3bcfc4b52849b46fb07;hp=8d6a756de4c43d9560bb6e6288c86df295a104ad;hpb=bec320673b7507612a07e033cb3d576eb5d1607b;p=modules%2Fgeom.git diff --git a/src/GEOMToolsGUI/CMakeLists.txt b/src/GEOMToolsGUI/CMakeLists.txt old mode 100755 new mode 100644 index 8d6a756de..9556cfd6c --- a/src/GEOMToolsGUI/CMakeLists.txt +++ b/src/GEOMToolsGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 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,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 @@ -39,12 +37,13 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/GEOMBase ${PROJECT_SOURCE_DIR}/src/Material ${PROJECT_SOURCE_DIR}/src/DependencyTree + ${PROJECT_SOURCE_DIR}/src/GEOMUtils ${CMAKE_CURRENT_SOURCE_DIR} ) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${QT_DEFINITIONS} ) @@ -57,8 +56,13 @@ SET(_link_LIBRARIES GEOM GEOMBase Material - DependencyTree ) + +IF(SALOME_USE_GRAPHICSVIEW) + LIST(APPEND _link_LIBRARIES + DependencyTree + ) +ENDIF() # --- headers --- @@ -73,6 +77,7 @@ SET(GEOMToolsGUI_HEADERS GEOMToolsGUI_PublishDlg.h GEOMToolsGUI_MaterialPropertiesDlg.h GEOMToolsGUI_LineWidthDlg.h + GEOMToolsGUI_ReduceStudyDlg.h ) # header files / to be processed by moc @@ -85,12 +90,13 @@ SET(_moc_HEADERS GEOMToolsGUI_PublishDlg.h GEOMToolsGUI_MaterialPropertiesDlg.h GEOMToolsGUI_LineWidthDlg.h + GEOMToolsGUI_ReduceStudyDlg.h ) # --- sources --- # sources / moc wrappings -QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) +QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS}) SET(GEOMToolsGUI_SOURCES GEOMToolsGUI.cxx @@ -103,6 +109,7 @@ SET(GEOMToolsGUI_SOURCES GEOMToolsGUI_PublishDlg.cxx GEOMToolsGUI_MaterialPropertiesDlg.cxx GEOMToolsGUI_LineWidthDlg.cxx + GEOMToolsGUI_ReduceStudyDlg.cxx ${_moc_SOURCES} )