- do not compile ipopt on Windows as it is already part of OMDev.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18183 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 18, 2013 · 1109bab · 1109bab
1 parent a52835d
commit 1109bab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile.common b/Makefile.common
@@ -46,7 +46,7 @@ install-python:
 install-openturns: mkbuilddirs
 	(time cp SimulationRuntime/OpenTurns/* $(builddir_share)/omc/scripts/OpenTurns/)
 
-interactive: .testvariables mkbuilddirs boehm-gc fmil msl-external-libs lis ipopt
+interactive: .testvariables mkbuilddirs boehm-gc fmil msl-external-libs lis $(IPOPT_TARGET)
 	$(MAKE) -C SimulationRuntime/interactive -f $(defaultMakefileTarget)
 	# Depends on libinteractive.a
 	$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget)

diff --git a/Makefile.in b/Makefile.in
@@ -32,6 +32,7 @@ LIBFMILIB=@LIBFMILIB@
 LD_LAPACK=@LD_LAPACK@
 LAPACK_TARGET=@LAPACK_TARGET@
 OPENBLAS_EXTRA_ARGS=@OPENBLAS_EXTRA_ARGS@
+IPOPT_TARGET=ipopt
 # We don't want the shared version, but symbols are not exported if we use the static version
 # This compiles the shared and static versions, but we only copy the static version...
 FMILIB_SHARED = OFF