- improved cmake error handling if umfpack was not found

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25216 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

SimulationRuntime/cpp/CMake/FindSuiteSparse.cmake

@@ -7,11 +7,12 @@
 # SUITESPARSE_UMFPACK_INCLUDE_DIR_OMC                - This variable contains either the absolute path to the include dir, if the system version is used or the relative path to $(OMHOME) of the OMC-Version is used
 # SUITESPARSE_UMFPACK_LIBRARIES                      - The umfpack libraries including the amd library
 # SUITESPARSE_UMFPACK_LIBRARIES_OMC                  - This variable contains either the absolute path to umfpack libraries, if the system version is used or the relative path to $(OMHOME) of the OMC-Version is used
-# SUITESPARSE_UMFPACK_LIBS
+# SUITESPARSE_UMFPACK_LIBS                           - The directory containing the umfpack libraries
 
 SET(SUITESPARSE_UMFPACK_FOUND false)
 SET(SUITESPARSE_UMFPACK_USE_OMC false)
 
+SET(SUITESPARSE_UMFPACK_INCLUDE_DIR_OMC "")
 
 MESSAGE(STATUS "Searching for umfpack.h of OpenModelica")
 FIND_FILE(UMFPACK_H_OMC umfpack.h HINTS "${CMAKE_SOURCE_DIR}/../../build/include/omc/c/suitesparse/Include" NO_DEFAULT_PATH)

SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt

@@ -160,6 +160,12 @@ ELSE()
 	SET(PUGIXML_INCLUDE_DIR_ ${PUGIXML_INCLUDE_DIR})
 ENDIF()
 
+IF("${SUITESPARSE_UMFPACK_INCLUDE_DIR_OMC}" STREQUAL "")
+	SET(UMFPACK_INCLUDE_ ".")
+ELSE()
+	SET(UMFPACK_INCLUDE_ "${SUITESPARSE_UMFPACK_INCLUDE_DIR_OMC}")
+ENDIF()
+
 SET(Boost_LIBRARIES_NEW)
 FOREACH(lib ${Boost_LIBRARIES})
   GET_FILENAME_COMPONENT(libNew "${lib}" NAME_WE)
@@ -206,8 +212,8 @@ MESSAGE(STATUS "--SUNDIALS_LIBRARIES = ${SUNDIALS_LIBRARIES_}")
 MESSAGE(STATUS "--LAPACK_LIBS = ${LAPACK_LIBS_}")
 MESSAGE(STATUS "--LAPACK_LIBRARIES = ${LAPACK_LIBRARIES_}")
 MESSAGE(STATUS "--UMFPACK_LIBS = ${SUITESPARSE_UMFPACK_LIBS}")
-MESSAGE(STATUS "--UMFPACK_INCLUDE = ${SUITESPARSE_UMFPACK_INCLUDE_DIR_OMC}")
-MESSAGE(STATUS "--UMFPACK_LIBS = ${UMFPACK_LIBRARIES_}")
+MESSAGE(STATUS "--UMFPACK_INCLUDE = ${UMFPACK_INCLUDE_}")
+MESSAGE(STATUS "--UMFPACK_LIBRARIES = ${UMFPACK_LIBRARIES_}")
 MESSAGE(STATUS " ")
 
 add_precompiled_header(${ModelicaName} Include/Core/Modelica.h )

SimulationRuntime/cpp/Core/Modelica/ModelicaConfig.inc.in

@@ -10,8 +10,8 @@ LAPACK_LIBS = @LAPACK_LIBS_@
 LAPACK_LIBRARIES = @LAPACK_LIBRARIES_@
 
 UMFPACK_LIBS = @SUITESPARSE_UMFPACK_LIBS@
-UMFPACK_INCLUDE = @SUITESPARSE_UMFPACK_INCLUDE_DIR_OMC@
-UMFPACK_LIBS = @UMFPACK_LIBRARIES_@
+UMFPACK_INCLUDE = @UMFPACK_INCLUDE_@
+UMFPACK_LIBRARIES = @UMFPACK_LIBRARIES_@
 
 INTEL_TBB_INCLUDE = @TBB_INCLUDE_DIR_@
 INTEL_TBB_LIBRARIES = @INTEL_TBB_LIBS@