From bcbc79ef450b1d202d02677fd78e3e45dbdc1760 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 28 Jul 2016 14:38:45 +0300 Subject: [PATCH] Moving *all* CMake detection files to common CONFIGURATION repo: udapte CMakeLists --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 512fb92..5ba22a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,9 +33,16 @@ 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) -# Our own set of macros: -# ================== -LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules") +# 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() + INCLUDE(SalomeSetupPlatform) INCLUDE(SalomeMacros) -- 2.39.2