Fix for '53116: OCC viewer is not updated by Apply in 'Scaling' dialog.' issue

[modules/gui.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e65f907d773096664b97da9d9879a4559ade7352..a93a9a76c211bb4624c93d8f46985380152247f6 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,12 +39,21 @@ SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
+# Common CMake macros
+# ===================
+SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
+IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+  INCLUDE(SalomeMacros)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
+
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
   ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
   INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
@@ -54,11 +63,9 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 
 # Platform setup
 # ==============
-INCLUDE(SalomeSetupPlatform)   # From KERNEL
+INCLUDE(SalomeSetupPlatform)   # From CONFIGURATION
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
-# Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
 # User options
 # ============
@@ -331,7 +338,6 @@ SET(_${PROJECT_NAME}_exposed_targets
 )
 
 # CAF package (not compilable while TDocStd_Application::Formats is removed)
-MESSAGE( STATUS "CAS_VERSION_STR:         " ${CAS_VERSION_STR} )
 IF(CAS_VERSION_STR VERSION_LESS "7.0.1")
   LIST(APPEND _${PROJECT_NAME}_exposed_targets 
        caf)