Fix copying of sundials libraries (#6933)

Some OSes use lib64, some use lib, some use lib/x86_64-linux-gnu.
And some use different paths in the package builder for the OS.

OMCompiler/Makefile.common

@@ -622,8 +622,7 @@ $(builddir_lib_omc)/libsundials_ida.a: 3rdParty/sundials-5.4.0/CMakeLists.txt
 	(cp -pfr 3rdParty/sundials-5.4.0/build/include/* $(OMBUILDDIR)/include/omc/c/sundials)
 	cp 3rdParty/sundials-5.4.0/src/kinsol/kinsol_impl.h $(OMBUILDDIR)/include/omc/c/sundials/kinsol/
 	# copy the libs to the build/lib/omc directory
-	if test -d 3rdParty/sundials-5.4.0/build/lib64/ ; then mv 3rdParty/sundials-5.4.0/build/lib64 3rdParty/sundials-5.4.0/build/lib ; fi
-	(cp -pf 3rdParty/sundials-5.4.0/build/lib/* $(builddir_lib_omc))
+	find 3rdParty/sundials-5.4.0/build/lib* -xtype f -exec cp -pf {} $(builddir_lib_omc) ";"
 
 	test ! `uname` = Darwin || install_name_tool -id @rpath/libsundials_arkode.1.0.0.dylib "$(builddir_lib_omc)/libsundials_arkode.1.0.0.dylib"
 	test ! `uname` = Darwin || install_name_tool -id @rpath/libsundials_arkode.1.dylib     "$(builddir_lib_omc)/libsundials_arkode.1.dylib"

OMCompiler/SimulationRuntime/OMSI/solver/CMakeLists.txt

@@ -24,7 +24,7 @@ ELSE()
   FIND_PACKAGE(LAPACK)
 ENDIF()
 
-IF (BLAS_FOUND STREQUAL "NOTFOUND")
+IF (BLAS_FSOUND STREQUAL "NOTFOUND")
   MESSAGE(FATAL_ERROR "Error: Blas Libraries not found!")
 ENDIF()
 IF (LAPACK_FOUND STREQUAL "NOTFOUND")
@@ -48,13 +48,14 @@ ENDIF(MSVC)
 IF(MSVC)
   SET(SUNDIALS_PATH ${OMCTRUNCHOME}/OMCompiler/3rdParty/sundials-5.4.0/build_msvc)
 ELSE(MSVC)
+  # Shouldn't this point to the build directory with the installed libraries?
   SET(SUNDIALS_PATH ${OMCTRUNCHOME}/OMCompiler/3rdParty/sundials-5.4.0/build)
 ENDIF(MSVC)
 GET_FILENAME_COMPONENT(SUNDIALS_PATH "${SUNDIALS_PATH}" ABSOLUTE)
 MESSAGE(STATUS "Sundials PATH:")
 MESSAGE(STATUS "${SUNDIALS_PATH}")
 
-FIND_PATH(SUNDIALS_LIB_DIR NAMES sundials_nvecserial libsundials_nvecserial sundials_nvecserial.dll libsundials_nvecserial.so sundials_nvecserial.a libsundials_nvecserial.a sundials_nvecserial.lib PATHS ${SUNDIALS_PATH}/lib)
+FIND_PATH(SUNDIALS_LIB_DIR NAMES sundials_nvecserial libsundials_nvecserial sundials_nvecserial.dll libsundials_nvecserial.so sundials_nvecserial.a libsundials_nvecserial.a sundials_nvecserial.lib PATHS ${SUNDIALS_PATH}/lib ${SUNDIALS_PATH}/lib64)
 
 MESSAGE(STATUS "Sundials libs:")
 MESSAGE(STATUS "${SUNDIALS_LIB_DIR}")