mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-11 16:19:17 +05:00
Update to conform with new macros
This commit is contained in:
parent
b5c2a231e7
commit
868245ec86
@ -96,15 +96,15 @@ ENDIF()
|
||||
IF(SALOME_BUILD_TESTS)
|
||||
ENABLE_TESTING()
|
||||
FIND_PACKAGE(SalomeCppUnit)
|
||||
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(CppUnit SALOME_BUILD_TESTS)
|
||||
SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
|
||||
ENDIF()
|
||||
IF(SALOME_BUILD_DOC)
|
||||
FIND_PACKAGE(SalomeDoxygen)
|
||||
FIND_PACKAGE(SalomeGraphviz)
|
||||
FIND_PACKAGE(SalomeSphinx)
|
||||
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Doxygen SALOME_BUILD_DOC)
|
||||
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Graphviz SALOME_BUILD_DOC)
|
||||
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Sphinx SALOME_BUILD_DOC)
|
||||
SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
|
||||
SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC)
|
||||
SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
|
||||
ENDIF()
|
||||
|
||||
# Find GUI (optional)
|
||||
@ -116,7 +116,7 @@ IF(SALOME_BUILD_GUI)
|
||||
ELSE(EXISTS ${GUI_ROOT_DIR})
|
||||
MESSAGE(STATUS "GUI_ROOT_DIR is not well defined, GEOM will be built without GUI!!!")
|
||||
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)
|
||||
|
||||
##
|
||||
@ -130,12 +130,12 @@ IF(SALOME_BUILD_GUI)
|
||||
# Optional prerequisites for GUI
|
||||
IF(SALOME_USE_GLVIEWER)
|
||||
FIND_PACKAGE(SalomeOpenGL)
|
||||
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OpenGL SALOME_USE_GLVIEWER)
|
||||
SALOME_LOG_OPTIONAL_PACKAGE(OpenGL SALOME_USE_GLVIEWER)
|
||||
ENDIF()
|
||||
IF(SALOME_USE_VTKVIEWER)
|
||||
# Required components are listed in the FindSalomeVTK.cmake file:
|
||||
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(SALOME_BUILD_GUI)
|
||||
@ -149,7 +149,7 @@ FIND_PACKAGE(SalomeCAS REQUIRED)
|
||||
IF(SALOME_BUILD_GUI)
|
||||
# OpenCV
|
||||
FIND_PACKAGE(SalomeOpenCV)
|
||||
SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV)
|
||||
SALOME_LOG_OPTIONAL_PACKAGE(OpenCV SALOME_GEOM_USE_OPENCV)
|
||||
ELSE()
|
||||
SET(SALOME_GEOM_USE_OPENCV OFF)
|
||||
ENDIF(SALOME_BUILD_GUI)
|
||||
@ -158,7 +158,7 @@ IF(SALOME_GEOM_USE_OPENCV)
|
||||
ENDIF()
|
||||
|
||||
# Detection summary:
|
||||
SALOME_PACKAGE_REPORT()
|
||||
SALOME_PACKAGE_REPORT_AND_CHECK()
|
||||
|
||||
|
||||
# Directories
|
||||
|
Loading…
Reference in New Issue
Block a user