X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=CMakeCommon%2FFindSolveSpace.cmake;h=6e32fc802eca6a884bab53d9809150bdf3957f23;hb=9499654d176cf811426e1ef3a6fba86cd78d200e;hp=c8d269f521cb9a4a642145438440b5087090dd2e;hpb=6b4c275bd0ec90bbd4f34614ece1535a6ce2bbe7;p=modules%2Fshaper.git

diff --git a/CMakeCommon/FindSolveSpace.cmake b/CMakeCommon/FindSolveSpace.cmake
index c8d269f52..6e32fc802 100644
--- a/CMakeCommon/FindSolveSpace.cmake
+++ b/CMakeCommon/FindSolveSpace.cmake
@@ -1,6 +1,35 @@
-SET(SLVS_ROOT_DIR $ENV{SOLVESPACE_ROOT_DIR})
+# - Try to  find SolveSpace
+# Once done this will define
+#
+#  SOLVESPACE_FOUND - system has SolveSpace
+#  SOLVESPACE_INCLUDE_DIRS - the SolveSpace include directory
+#  SOLVESPACE_LIBRARIES - Link these to use SolveSpace
 
-INCLUDE_DIRECTORIES(${SLVS_ROOT_DIR}/include)
-LINK_DIRECTORIES(${SLVS_ROOT_DIR}/lib)
+#=============================================================================
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+#=============================================================================
 
-#SET(SLVS_LIBRARIES ${SLVS_ROOT_DIR}/lib/slvs.lib)
+IF(NOT SOLVESPACE_FIND_QUIETLY)
+  MESSAGE(STATUS "Try to find SolveSpace at $ENV{SOLVESPACE_ROOT_DIR}...")
+ENDIF()
+
+FIND_PATH(SOLVESPACE_INCLUDE_DIR NAMES slvs.h
+  HINTS ENV SOLVESPACE_ROOT_DIR
+  PATH_SUFFIXES include
+)
+
+FIND_LIBRARY(SOLVESPACE_LIBRARY NAMES slvs
+  HINTS ENV SOLVESPACE_ROOT_DIR
+  PATH_SUFFIXES lib
+)
+
+SET(SOLVESPACE_INCLUDE_DIRS ${SOLVESPACE_INCLUDE_DIR})
+SET(SOLVESPACE_LIBRARIES ${SOLVESPACE_LIBRARY})
+
+# handle the QUIETLY and REQUIRED arguments and set SOLVESPACE_FOUND to TRUE
+# if all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SolveSpace
+                                  REQUIRED_VARS SOLVESPACE_LIBRARY SOLVESPACE_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(SOLVESPACE_LIBRARY SOLVESPACE_INCLUDE_DIR)
\ No newline at end of file