added cminpack-clean to clean target, building cminpack with visual s…

…tudio when building runtimeCPPmsvcinstall

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

Makefile.common

@@ -191,6 +191,10 @@ CMinpack:
 	#TODO: Only copy required headers, add them in omc/fmi subfolder, and do not copy c/txt-files
 	#cp -rp 3rdParty/CMinpack/install/include/* $(builddir_inc)
 
+CMinpack-clean:
+	if test -f 3rdParty/CMinpack/build/Makefile; then make -C 3rdParty/CMinpack/build clean; fi
+	rm -f 3rdParty/CMinpack/build/Makefile
+
 testfast: test
 
 test:
@@ -282,7 +286,7 @@ fmil-clean:
 gc-clean:
 	if test -f 3rdParty/gc-7.2/Makefile; then make -C 3rdParty/gc-7.2 clean; fi
 	rm -f 3rdParty/gc-7.2/Makefile
-clean: qtclean fmil-clean opencl_rt_clean gc-clean lis-clean runtimeCPPclean
+clean: qtclean fmil-clean opencl_rt_clean gc-clean lis-clean runtimeCPPclean CMinpack-clean
 	(cd SimulationRuntime/c && $(MAKE) -f $(defaultMakefileTarget) clean)
 	(cd SimulationRuntime/interactive && $(MAKE) -f $(defaultMakefileTarget) clean)
 	(cd Compiler && $(MAKE) -f $(defaultMakefileTarget) clean)

SimulationRuntime/cpp/CMakeLists.txt

@@ -28,14 +28,21 @@ endif()
 SET(INSTALL_OMDEV_LIBS ON)
 ENDIF( WIN32 )
 
+# Find CMinpack
+# Note: Visual Studio libs are located in install/msvc, libs for gcc are directly in install
+if(MSVC)
+    SET(CMinpack_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/install/msvc")
+else(MSVC)
+    SET(CMinpack_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/install")
+endif(MSVC)    
 
 FIND_PATH(CMINPACK_INCLUDE_DIR cminpack.h
-          HINTS "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/install"
+          HINTS ${CMinpack_Path}
           PATH_SUFFIXES include include/cminpack include/cminpack-1)
 
 FIND_LIBRARY(CMINPACK_LIBRARY 
              NAMES cminpack
-             HINTS "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/install"
+             HINTS ${CMinpack_Path}
              PATH_SUFFIXES lib lib64)
 
 include_directories(${CMINPACK_INCLUDE_DIR})