ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-25 04:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Update to conform with new macros

Browse Source
This commit is contained in:
rnc 2013-09-17 12:00:03 +00:00
parent b5c2a231e7
commit 868245ec86
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -96,15 +96,15 @@ ENDIF()
IF(SALOME_BUILD_TESTS) IF(SALOME_BUILD_TESTS)
ENABLE_TESTING() ENABLE_TESTING()
FIND_PACKAGE(SalomeCppUnit) FIND_PACKAGE(SalomeCppUnit)
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(CppUnit SALOME_BUILD_TESTS) SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
ENDIF() ENDIF()
IF(SALOME_BUILD_DOC) IF(SALOME_BUILD_DOC)
FIND_PACKAGE(SalomeDoxygen) FIND_PACKAGE(SalomeDoxygen)
FIND_PACKAGE(SalomeGraphviz) FIND_PACKAGE(SalomeGraphviz)
FIND_PACKAGE(SalomeSphinx) FIND_PACKAGE(SalomeSphinx)
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Doxygen SALOME_BUILD_DOC) SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Graphviz SALOME_BUILD_DOC) SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC)
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Sphinx SALOME_BUILD_DOC) SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
ENDIF() ENDIF()
# Find GUI (optional) # Find GUI (optional)
@ -116,7 +116,7 @@ IF(SALOME_BUILD_GUI)
ELSE(EXISTS ${GUI_ROOT_DIR}) ELSE(EXISTS ${GUI_ROOT_DIR})
MESSAGE(STATUS "GUI_ROOT_DIR is not well defined, GEOM will be built without GUI!!!") MESSAGE(STATUS "GUI_ROOT_DIR is not well defined, GEOM will be built without GUI!!!")
ENDIF(EXISTS ${GUI_ROOT_DIR}) ENDIF(EXISTS ${GUI_ROOT_DIR})
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(SalomeGUI SALOME_BUILD_GUI) SALOME_LOG_OPTIONAL_PACKAGE(SalomeGUI SALOME_BUILD_GUI)
ENDIF(SALOME_BUILD_GUI) ENDIF(SALOME_BUILD_GUI)
## ##
@ -130,12 +130,12 @@ IF(SALOME_BUILD_GUI)
# Optional prerequisites for GUI # Optional prerequisites for GUI
IF(SALOME_USE_GLVIEWER) IF(SALOME_USE_GLVIEWER)
FIND_PACKAGE(SalomeOpenGL) FIND_PACKAGE(SalomeOpenGL)
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OpenGL SALOME_USE_GLVIEWER) SALOME_LOG_OPTIONAL_PACKAGE(OpenGL SALOME_USE_GLVIEWER)
ENDIF() ENDIF()
IF(SALOME_USE_VTKVIEWER) IF(SALOME_USE_VTKVIEWER)
# Required components are listed in the FindSalomeVTK.cmake file: # Required components are listed in the FindSalomeVTK.cmake file:
FIND_PACKAGE(SalomeVTK 6.0) FIND_PACKAGE(SalomeVTK 6.0)
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(VTK SALOME_USE_VTKVIEWER) SALOME_LOG_OPTIONAL_PACKAGE(VTK SALOME_USE_VTKVIEWER)
ENDIF() ENDIF()
ENDIF(SALOME_BUILD_GUI) ENDIF(SALOME_BUILD_GUI)
@ -149,7 +149,7 @@ FIND_PACKAGE(SalomeCAS REQUIRED)
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
# OpenCV # OpenCV
FIND_PACKAGE(SalomeOpenCV) FIND_PACKAGE(SalomeOpenCV)
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV) SALOME_LOG_OPTIONAL_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV)
ELSE() ELSE()
SET(SALOME_GEOM_USE_OPENCV OFF) SET(SALOME_GEOM_USE_OPENCV OFF)
ENDIF(SALOME_BUILD_GUI) ENDIF(SALOME_BUILD_GUI)
@ -158,7 +158,7 @@ IF(SALOME_GEOM_USE_OPENCV)
ENDIF() ENDIF()
# Detection summary: # Detection summary:
SALOME_PACKAGE_REPORT() SALOME_PACKAGE_REPORT_AND_CHECK()
# Directories # Directories