From: spo Date: Fri, 11 Sep 2015 14:40:23 +0000 (+0300) Subject: Issue #830 - cmake must fail if SolveSpace has not been found X-Git-Tag: V_1.4.0_beta4~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7638303606dfa53b519930c82d933bf9bcafafbe;p=modules%2Fshaper.git Issue #830 - cmake must fail if SolveSpace has not been found --- diff --git a/CMakeCommon/FindSolveSpace.cmake b/CMakeCommon/FindSolveSpace.cmake index 426b46c3c..6e32fc802 100644 --- a/CMakeCommon/FindSolveSpace.cmake +++ b/CMakeCommon/FindSolveSpace.cmake @@ -9,19 +9,19 @@ ## Copyright (C) 2014-20xx CEA/DEN, EDF R&D #============================================================================= -SET(_SOLVESPACE_PATHS $ENV{SOLVESPACE_ROOT_DIR}) - IF(NOT SOLVESPACE_FIND_QUIETLY) - MESSAGE(STATUS "Try to find SolveSpace at ${_SOLVESPACE_PATHS}...") + MESSAGE(STATUS "Try to find SolveSpace at $ENV{SOLVESPACE_ROOT_DIR}...") ENDIF() FIND_PATH(SOLVESPACE_INCLUDE_DIR NAMES slvs.h - PATHS ${_SOLVESPACE_PATHS} - PATH_SUFFIXES include) + HINTS ENV SOLVESPACE_ROOT_DIR + PATH_SUFFIXES include +) FIND_LIBRARY(SOLVESPACE_LIBRARY NAMES slvs - PATHS ${_SOLVESPACE_PATHS} - PATH_SUFFIXES lib) + HINTS ENV SOLVESPACE_ROOT_DIR + PATH_SUFFIXES lib +) SET(SOLVESPACE_INCLUDE_DIRS ${SOLVESPACE_INCLUDE_DIR}) SET(SOLVESPACE_LIBRARIES ${SOLVESPACE_LIBRARY})