Changeset 14109

Timestamp:

Nov 18, 2019 2:16:14 PM (4 weeks ago)

Author:

randersson

Message:

#5819 Reverted back the CasADi Makefile since previous changes are no longer required

Location:

branches/dev-5819

Files:

• Makefile.in (modified) (8 diffs)
• MakefileCasadi.am (modified) (9 diffs)

branches/dev-5819/Makefile.in

@@ -352 +352 @@
 CMAKE_CASADI_CXX_FLAG64 = -m64
 CMAKE_CASADI_COMPILER_ARGS64 = -m64 -fpermissive
-@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR)
-@BUILD_WITH_PYTHON32_TRUE@TMP_SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR)
-@BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG64)
-@BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG)
-@BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_ARGS = $(CMAKE_CASADI_ARGS64)
-@BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_ARGS = $(CMAKE_CASADI_ARGS)
-@BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS64)
-@BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS)
-@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_INST_DIR = $(CASADI_INST_DIR)
-@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR)
-@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR)
-
-# note we set directories to those without 64bit suffix
-@BUILD_WITH_PYTHON32_FALSE@TMP_MC_LIB = $(MC_LIB64)
-@BUILD_WITH_PYTHON32_TRUE@TMP_MC_LIB = $(MC_LIB)
-@BUILD_WITH_PYTHON32_FALSE@TMP_MC_BUILD = $(MC_BUILD64)
-@BUILD_WITH_PYTHON32_TRUE@TMP_MC_BUILD = $(MC_BUILD)
 @NUMPY_NO_MSVCR_FALSE@NUMPY_NO_MSVCR_ARG = 
 @NUMPY_NO_MSVCR_TRUE@NUMPY_NO_MSVCR_ARG = --no-msvcr="true"
@@ -902 +885 @@
 
 
-@BUILD_WITH_PYTHON32_FALSE@ case $(build) in \
-@BUILD_WITH_PYTHON32_FALSE@ *-cygwin*|*-mingw*) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_CASADI_INST_DIR=$(CASADI_INST_DIR64) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR64) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR64) ;; \
-@BUILD_WITH_PYTHON32_FALSE@ *) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_CASADI_INST_DIR=$(CASADI_INST_DIR) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR) \
-@BUILD_WITH_PYTHON32_FALSE@ TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR) ;; \
-@BUILD_WITH_PYTHON32_FALSE@ esac
-
 .PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
 
 casadi:
 @COMPILE_WITH_IPOPT_TRUE@   cd $(abs_builddir)/ThirdParty/CasADi; \
-@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile  "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${TMP_CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${TMP_CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${TMP_CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${TMP_CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${TMP_CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${TMP_CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
+@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile  "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
 @COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
 @COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
@@ -931 +899 @@
 install_casadi: casadi
 @COMPILE_WITH_IPOPT_TRUE@   cd $(abs_builddir)/ThirdParty/CasADi; \
-@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile install "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
+@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
 @COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python/
-@COMPILE_WITH_IPOPT_TRUE@   cp -r $(TMP_CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
-@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
+@COMPILE_WITH_IPOPT_TRUE@   cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
+@COMPILE_WITH_IPOPT_TRUE@   cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
 @COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
 @COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME);  
 @COMPILE_WITH_IPOPT64_TRUE@ cd $(abs_builddir)/ThirdParty/CasADi; \
-@COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
+@COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
 @COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python/
 @COMPILE_WITH_IPOPT64_TRUE@ cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
@@ -947 +915 @@
 casadi_interface: install_casadi_interface
 build_casadi_interface: casadi modelicacasadi_wrapper
-install_casadi_interface: install_casadi $(TMP_MC_LIB) $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/modelica_casadi_transfer_wrapper.py
+install_casadi_interface: install_casadi $(MC_LIB) $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/modelica_casadi_transfer_wrapper.py
     if [ "$(INSTALL_EXTRA_CASADI)" ]; then exec "$(INSTALL_EXTRA_CASADI)" "$(abs_top_srcdir)" "$(DESTDIR)$(prefix)"; fi
 
 ifcasadi: casadi
-@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
-@COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/ifcasadi; \
+@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_BUILD)/ifcasadi; \
+@COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/ifcasadi; \
 @COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
 @COMPILE_WITH_IPOPT_TRUE@   *-cygwin*|*-mingw*) \
-@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
-@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
+@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
+@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
 @COMPILE_WITH_IPOPT_TRUE@   *) \
 @COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) \
-@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
+@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
 @COMPILE_WITH_IPOPT_TRUE@   esac 
-@COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/ifcasadi;  make
+@COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/ifcasadi;  make
 @COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}";
 @COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME);
@@ -972 +940 @@
 @COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
 
-$(TMP_MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
-@COMPILE_WITH_IPOPT_TRUE@   rm -rf $(TMP_MC_LIB)
-@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_LIB)
-@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
-@COMPILE_WITH_IPOPT_TRUE@   cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
-@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
+$(MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
+@COMPILE_WITH_IPOPT_TRUE@   rm -rf $(MC_LIB)
+@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_LIB)
+@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB)
+@COMPILE_WITH_IPOPT_TRUE@   cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB)
+@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB)
 @COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
 @COMPILE_WITH_IPOPT_TRUE@   *-cygwin*) \
-@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
+@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
 @COMPILE_WITH_IPOPT_TRUE@   *-mingw*) \
-@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
+@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
 @COMPILE_WITH_IPOPT_TRUE@   *) \
-@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/libifcasadi.so $(TMP_MC_LIB) ;; \
+@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/libifcasadi.so $(MC_LIB) ;; \
 @COMPILE_WITH_IPOPT_TRUE@   esac
 @COMPILE_WITH_IPOPT64_TRUE@ rm -rf $(MC_LIB64)
@@ -1009 +977 @@
 $(OC_CASADI_BUILD)/bin/separateProcess.jar:  mc_optimica
 
-$(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
-
-modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(TMP_MC_LIB)
-@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
-@COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
+$(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
+
+modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(MC_LIB)
+@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_BUILD)/modelicacasadi_wrapper; \
+@COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/modelicacasadi_wrapper; \
 @COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
 @COMPILE_WITH_IPOPT_TRUE@   *-cygwin*|*-mingw*) \
-@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
-@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
+@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
+@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
 @COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
 @COMPILE_WITH_IPOPT_TRUE@       "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
 @COMPILE_WITH_IPOPT_TRUE@   *) \
 @COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) \
-@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
+@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
 @COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
 @COMPILE_WITH_IPOPT_TRUE@       "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
 @COMPILE_WITH_IPOPT_TRUE@   esac 
-@COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
+@COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
 @COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
 @COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
@@ -1044 +1012 @@
  $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py: install_modelicacasadi_wrapper
 
- install_modelicacasadi_wrapper: $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
+ install_modelicacasadi_wrapper: $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
 @COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
-@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper 
+@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper 
 @COMPILE_WITH_IPOPT_TRUE@   rm -f $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
 @COMPILE_WITH_IPOPT_TRUE@   touch $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
@@ -1073 +1041 @@
 
 clean-casadi-interface: 
-    rm -rf $(TMP_MC_BUILD)
+    rm -rf $(MC_BUILD)
     rm -rf $(MC_BUILD64)
 #   rm -rf $(DESTDIR)$(prefix)/Python/casadi

branches/dev-5819/MakefileCasadi.am

@@ -50 +50 @@
 CMAKE_CASADI_COMPILER_ARGS64=-m64 -fpermissive
 
-if BUILD_WITH_PYTHON32
-TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)
-TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)
-TMP_CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG)
-TMP_CMAKE_CASADI_ARGS=$(CMAKE_CASADI_ARGS)
-TMP_CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS)
-
-TMP_CASADI_INST_DIR=$(CASADI_INST_DIR)
-TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR)
-TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR)
-TMP_MC_LIB=$(MC_LIB)
-TMP_MC_BUILD=$(MC_BUILD)
-
-else
-    case $(build) in \
-    *-cygwin*|*-mingw*) \
-    TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64) \
-    TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64) \
-    TMP_CASADI_INST_DIR=$(CASADI_INST_DIR64) \
-    TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR64) \
-    TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR64) ;; \
-    *) \
-    TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR) \
-    TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR) \
-    TMP_CASADI_INST_DIR=$(CASADI_INST_DIR) \
-    TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR) \
-    TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR) ;; \
-    esac
-TMP_CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG64)
-TMP_CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS64)
-
-# note we set directories to those without 64bit suffix
-
-TMP_MC_LIB=$(MC_LIB64)
-TMP_MC_BUILD=$(MC_BUILD64)
-TMP_CMAKE_CASADI_ARGS=$(CMAKE_CASADI_ARGS64)
-endif
-
-
 .PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
 
@@ -94 +55 @@
 if COMPILE_WITH_IPOPT
     cd $(abs_builddir)/ThirdParty/CasADi; \
-    make -f Makefile  "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${TMP_CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${TMP_CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${TMP_CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${TMP_CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${TMP_CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${TMP_CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
+    make -f Makefile  "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
 endif
 if COMPILE_WITH_IPOPT64
@@ -108 +69 @@
 if COMPILE_WITH_IPOPT
     cd $(abs_builddir)/ThirdParty/CasADi; \
-    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
+    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
     mkdir -p $(DESTDIR)$(prefix)/Python/
-    cp -r $(TMP_CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
+    cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
     ## temp fix
-    cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
+    cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
 endif
 if COMPILE_WITH_IPOPT64  
@@ -118 +79 @@
     export PYTHONHOME=$(PYTHON64_HOME);  
     cd $(abs_builddir)/ThirdParty/CasADi; \
-    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
+    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
     mkdir -p $(DESTDIR)$(prefix)/Python/
     cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
@@ -129 +90 @@
 casadi_interface: install_casadi_interface
 build_casadi_interface: casadi modelicacasadi_wrapper
-install_casadi_interface: install_casadi $(TMP_MC_LIB) $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/modelica_casadi_transfer_wrapper.py
+install_casadi_interface: install_casadi $(MC_LIB) $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/modelica_casadi_transfer_wrapper.py
     if [ "$(INSTALL_EXTRA_CASADI)" ]; then exec "$(INSTALL_EXTRA_CASADI)" "$(abs_top_srcdir)" "$(DESTDIR)$(prefix)"; fi
 
 ifcasadi: casadi
 if COMPILE_WITH_IPOPT
-    mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
-    cd $(TMP_MC_BUILD)/ifcasadi; \
+    mkdir -p $(MC_BUILD)/ifcasadi; \
+    cd $(MC_BUILD)/ifcasadi; \
     case $(build) in \
     *-cygwin*|*-mingw*) \
-    cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
-        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
+    cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
+        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
     *) \
     cmake $(MC_SRC_SWIG) \
-        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
+        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
     esac 
-    cd $(TMP_MC_BUILD)/ifcasadi;  make
+    cd $(MC_BUILD)/ifcasadi;  make
 endif
 if COMPILE_WITH_IPOPT64
@@ -158 +119 @@
 endif
 
-$(TMP_MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
-if COMPILE_WITH_IPOPT
-    rm -rf $(TMP_MC_LIB)
-    mkdir -p $(TMP_MC_LIB)
-    cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
-    cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
-    cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
+$(MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
+if COMPILE_WITH_IPOPT
+    rm -rf $(MC_LIB)
+    mkdir -p $(MC_LIB)
+    cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB)
+    cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB)
+    cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB)
     case $(build) in \
     *-cygwin*) \
-    cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
+    cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
     *-mingw*) \
-    cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
+    cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
     *) \
-    cp $(TMP_MC_BUILD)/ifcasadi/libifcasadi.so $(TMP_MC_LIB) ;; \
+    cp $(MC_BUILD)/ifcasadi/libifcasadi.so $(MC_LIB) ;; \
     esac
 endif
@@ -199 +160 @@
 $(OC_CASADI_BUILD)/bin/separateProcess.jar:  mc_optimica
 
-$(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
-
-
-modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(TMP_MC_LIB)
-if COMPILE_WITH_IPOPT
-    mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
-    cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
+$(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
+
+
+modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(MC_LIB)
+if COMPILE_WITH_IPOPT
+    mkdir -p $(MC_BUILD)/modelicacasadi_wrapper; \
+    cd $(MC_BUILD)/modelicacasadi_wrapper; \
     case $(build) in \
     *-cygwin*|*-mingw*) \
-    cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
-        -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
+    cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
+        -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
         -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
         "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
     *) \
     cmake $(MC_INTERFACE) \
-        -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
+        -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
         -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
         "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
     esac 
-    cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
+    cd $(MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
 endif
 if COMPILE_WITH_IPOPT64
@@ -239 +200 @@
  $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py: install_modelicacasadi_wrapper
  
- install_modelicacasadi_wrapper: $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
+ install_modelicacasadi_wrapper: $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
 if COMPILE_WITH_IPOPT
     mkdir -p $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
-    cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper 
+    cp $(MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper 
     rm -f $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
     touch $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
@@ -276 +237 @@
         
 clean-casadi-interface: 
-    rm -rf $(TMP_MC_BUILD)
+    rm -rf $(MC_BUILD)
     rm -rf $(MC_BUILD64)
 #   rm -rf $(DESTDIR)$(prefix)/Python/casadi