Changeset 13691


Ignore:
Timestamp:
Oct 8, 2019 8:31:56 AM (2 months ago)
Author:
randersson
Message:

#5819 Updated additional variables that were not updated previously. In the current state casadi is building all the way until ifcasadi target, it currently fails due to issues with locating DLL and I believe this is because of missing updates of variables that has been done now in this change.

Location:
branches/dev-5819
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/Makefile.am

    r13685 r13691  
    7474    export PYTHONHOME=$(PYTHON64_HOME); \
    7575    cd $(abs_builddir)/ThirdParty/CasADi; \
    76     make -f Makefile  "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)" "CASADI_PYTHON_INST_DIR=${CASADI_PYTHON_INST_DIR64}" "CASADI_INST_DIR=${CASADI_INST_DIR64}" "CASADI_PLUGIN_INST_DIR=${CASADI_PLUGIN_INST_DIR64}" "CMAKE_CASADI_ARGS=${CMAKE_CASADI_ARGS64}" "CMAKE_CASADI_COMPILER_ARGS=${CMAKE_CASADI_COMPILER_ARGS64}" "CMAKE_CASADI_CXX_FLAG=${CMAKE_CASADI_CXX_FLAG64}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON64_LIB}" "CMAKE_PYTHON_INCLUDE=${CMAKE_PYTHON64_INCLUDE}"
     76    make -f Makefile  "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT64_HOME)" "CASADI_PYTHON_INST_DIR=${CASADI_PYTHON_INST_DIR64}" "CASADI_INST_DIR=${CASADI_INST_DIR64}" "CASADI_PLUGIN_INST_DIR=${CASADI_PLUGIN_INST_DIR64}" "CMAKE_CASADI_ARGS=${CMAKE_CASADI_ARGS64}" "CMAKE_CASADI_COMPILER_ARGS=${CMAKE_CASADI_COMPILER_ARGS64}" "CMAKE_CASADI_CXX_FLAG=${CMAKE_CASADI_CXX_FLAG64}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON64_LIB}" "CMAKE_PYTHON_INCLUDE=${CMAKE_PYTHON64_INCLUDE}"
    7777    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    7878    export PATH="$(ORIG_PATH)";
     
    9292    export PYTHONHOME=$(PYTHON64_HOME); 
    9393    cd $(abs_builddir)/ThirdParty/CasADi; \
    94     make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
     94    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT64_HOME)"
    9595    mkdir -p $(DESTDIR)$(prefix)/Python/
    9696    cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
    9797    ## temp fix
    98     cp $(CASADI_BUILD_DIR64)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
     98    cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
    9999    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    100100    export PATH="$(ORIG_PATH)";
     
    179179ifcasadi: casadi
    180180if COMPILE_WITH_IPOPT
    181     mkdir -p $(MC_BUILD)/ifcasadi; \
    182     cd $(MC_BUILD)/ifcasadi; \
     181    mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
     182    cd $(TMP_MC_BUILD)/ifcasadi; \
    183183    case $(build) in \
    184184    *-cygwin*|*-mingw*) \
    185     cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(CMAKE_CASADI_CXX_FLAG)" \
    186         -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
     185    cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
     186        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
    187187    *) \
    188188    cmake $(MC_SRC_SWIG) \
    189         -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
     189        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
    190190    esac
    191     cd $(MC_BUILD)/ifcasadi;  make
     191    cd $(TMP_MC_BUILD)/ifcasadi;  make
    192192endif
    193193if COMPILE_WITH_IPOPT64
    194194    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}";
    195195    export PYTHONHOME=$(PYTHON64_HOME);
    196     mkdir -p $(MC_BUILD64)/ifcasadi; \
    197     cd $(MC_BUILD64)/ifcasadi; \
    198     cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CASADI_CXX_FLAG64)" -DCMAKE_CXX_FLAGS="$(CMAKE_CASADI_CXX_FLAG64)" \
    199         -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR64)"; \
    200     cd $(MC_BUILD64)/ifcasadi;  make
     196    mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
     197    cd $(TMP_MC_BUILD)/ifcasadi; \
     198    cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG64)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG64)" \
     199        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)"; \
     200    cd $(TMP_MC_BUILD)/ifcasadi;  make
    201201    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    202202    export PATH="$(ORIG_PATH)";
    203203endif
    204204
    205 $(MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
     205$(TMP_MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
    206206if COMPILE_WITH_IPOPT
    207     rm -rf $(MC_LIB)
    208     mkdir -p $(MC_LIB)
    209     cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB)
    210     cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB)
    211     cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB)
     207    rm -rf $(TMP_MC_LIB)
     208    mkdir -p $(TMP_MC_LIB)
     209    cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
     210    cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
     211    cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
    212212    case $(build) in \
    213213    *-cygwin*) \
    214     cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
     214    cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
    215215    *-mingw*) \
    216     cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
     216    cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
    217217    *) \
    218     cp $(MC_BUILD)/ifcasadi/libifcasadi.so $(MC_LIB) ;; \
     218    cp $(TMP_MC_BUILD)/ifcasadi/libifcasadi.so $(TMP_MC_LIB) ;; \
    219219    esac
    220220endif
    221221if COMPILE_WITH_IPOPT64
    222     rm -rf $(MC_LIB64)
    223     mkdir -p $(MC_LIB64)
    224     cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB64)
    225     cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB64)
    226     cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB64)
    227     cp $(MC_BUILD64)/ifcasadi/ifcasadi.dll $(MC_LIB64)
     222    rm -rf $(TMP_MC_LIB)
     223    mkdir -p $(TMP_MC_LIB)
     224    cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
     225    cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
     226    cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
     227    cp $(MC_BUILD64)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB)
    228228endif
    229229
     
    244244$(OC_CASADI_BUILD)/bin/separateProcess.jar:  mc_optimica
    245245
    246 $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
    247 
    248 
    249 modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(MC_LIB)
     246$(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
     247
     248
     249modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(TMP_MC_LIB)
    250250if COMPILE_WITH_IPOPT
    251     mkdir -p $(MC_BUILD)/modelicacasadi_wrapper; \
    252     cd $(MC_BUILD)/modelicacasadi_wrapper; \
     251    mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
     252    cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
    253253    case $(build) in \
    254254    *-cygwin*|*-mingw*) \
    255     cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(CMAKE_CASADI_CXX_FLAG)" \
    256         -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
     255    cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
     256        -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
    257257        -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    258258        "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
    259259    *) \
    260260    cmake $(MC_INTERFACE) \
    261         -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
     261        -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
    262262        -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    263263        "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
    264264    esac
    265     cd $(MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
     265    cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
    266266endif
    267267if COMPILE_WITH_IPOPT64
    268268    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    269269    export PYTHONHOME=$(PYTHON64_HOME); \
    270     mkdir -p $(MC_BUILD64)/modelicacasadi_wrapper; \
    271     cd $(MC_BUILD64)/modelicacasadi_wrapper; \
    272     cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CASADI_CXX_FLAG64)" -DCMAKE_CXX_FLAGS="$(CMAKE_CASADI_CXX_FLAG64)" \
    273         -DMC_BUILD="$(MC_BUILD64)" -DIPOPT_HOME="$(IPOPT64_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR64)" \
     270    mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
     271    cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
     272    cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG64)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG64)" \
     273        -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT64_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
    274274        -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    275275        "$(CMAKE_PYTHON64_LIB)" "$(CMAKE_PYTHON64_INCLUDE)"; \
    276     cd $(MC_BUILD64)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
     276    cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
    277277    export PYTHONHOME=$(ORIG_PYTHON_HOME);
    278278    export PATH="$(ORIG_PATH)";
     
    284284 $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py: install_modelicacasadi_wrapper
    285285 
    286  install_modelicacasadi_wrapper: $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
     286 install_modelicacasadi_wrapper: $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
    287287if COMPILE_WITH_IPOPT
    288288    mkdir -p $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    289     cp $(MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
     289    cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    290290    rm -f $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
    291291    touch $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
     
    296296    export PYTHONHOME=$(PYTHON64_HOME);
    297297    mkdir -p $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
    298     cp $(MC_BUILD64)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
     298    cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
    299299    rm -f $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper/__init__.py
    300300    touch $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper/__init__.py
  • branches/dev-5819/Makefile.in

    r13685 r13691  
    913913@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
    914914@COMPILE_WITH_IPOPT64_TRUE@ cd $(abs_builddir)/ThirdParty/CasADi; \
    915 @COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile  "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)" "CASADI_PYTHON_INST_DIR=${CASADI_PYTHON_INST_DIR64}" "CASADI_INST_DIR=${CASADI_INST_DIR64}" "CASADI_PLUGIN_INST_DIR=${CASADI_PLUGIN_INST_DIR64}" "CMAKE_CASADI_ARGS=${CMAKE_CASADI_ARGS64}" "CMAKE_CASADI_COMPILER_ARGS=${CMAKE_CASADI_COMPILER_ARGS64}" "CMAKE_CASADI_CXX_FLAG=${CMAKE_CASADI_CXX_FLAG64}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON64_LIB}" "CMAKE_PYTHON_INCLUDE=${CMAKE_PYTHON64_INCLUDE}"
     915@COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile  "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT64_HOME)" "CASADI_PYTHON_INST_DIR=${CASADI_PYTHON_INST_DIR64}" "CASADI_INST_DIR=${CASADI_INST_DIR64}" "CASADI_PLUGIN_INST_DIR=${CASADI_PLUGIN_INST_DIR64}" "CMAKE_CASADI_ARGS=${CMAKE_CASADI_ARGS64}" "CMAKE_CASADI_COMPILER_ARGS=${CMAKE_CASADI_COMPILER_ARGS64}" "CMAKE_CASADI_CXX_FLAG=${CMAKE_CASADI_CXX_FLAG64}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON64_LIB}" "CMAKE_PYTHON_INCLUDE=${CMAKE_PYTHON64_INCLUDE}"
    916916@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    917917@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     
    926926@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); 
    927927@COMPILE_WITH_IPOPT64_TRUE@ cd $(abs_builddir)/ThirdParty/CasADi; \
    928 @COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
     928@COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT64_HOME)"
    929929@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python/
    930930@COMPILE_WITH_IPOPT64_TRUE@ cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
    931 @COMPILE_WITH_IPOPT64_TRUE@ cp $(CASADI_BUILD_DIR64)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
     931@COMPILE_WITH_IPOPT64_TRUE@ cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
    932932@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    933933@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     
    943943
    944944ifcasadi: casadi
    945 @COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_BUILD)/ifcasadi; \
    946 @COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/ifcasadi; \
     945@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
     946@COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/ifcasadi; \
    947947@COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
    948948@COMPILE_WITH_IPOPT_TRUE@   *-cygwin*|*-mingw*) \
    949 @COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(CMAKE_CASADI_CXX_FLAG)" \
    950 @COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
     949@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)" \
     950@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
    951951@COMPILE_WITH_IPOPT_TRUE@   *) \
    952952@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) \
    953 @COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
     953@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
    954954@COMPILE_WITH_IPOPT_TRUE@   esac
    955 @COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/ifcasadi;  make
     955@COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/ifcasadi;  make
    956956@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}";
    957957@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME);
    958 @COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(MC_BUILD64)/ifcasadi; \
    959 @COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/ifcasadi; \
    960 @COMPILE_WITH_IPOPT64_TRUE@ cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CASADI_CXX_FLAG64)" -DCMAKE_CXX_FLAGS="$(CMAKE_CASADI_CXX_FLAG64)" \
    961 @COMPILE_WITH_IPOPT64_TRUE@     -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR64)"; \
    962 @COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/ifcasadi;  make
     958@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
     959@COMPILE_WITH_IPOPT64_TRUE@ cd $(TMP_MC_BUILD)/ifcasadi; \
     960@COMPILE_WITH_IPOPT64_TRUE@ cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG64)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG64)" \
     961@COMPILE_WITH_IPOPT64_TRUE@     -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)"; \
     962@COMPILE_WITH_IPOPT64_TRUE@ cd $(TMP_MC_BUILD)/ifcasadi;  make
    963963@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    964964@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
    965965
    966 $(MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
    967 @COMPILE_WITH_IPOPT_TRUE@   rm -rf $(MC_LIB)
    968 @COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_LIB)
    969 @COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB)
    970 @COMPILE_WITH_IPOPT_TRUE@   cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB)
    971 @COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB)
     966$(TMP_MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
     967@COMPILE_WITH_IPOPT_TRUE@   rm -rf $(TMP_MC_LIB)
     968@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_LIB)
     969@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
     970@COMPILE_WITH_IPOPT_TRUE@   cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
     971@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
    972972@COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
    973973@COMPILE_WITH_IPOPT_TRUE@   *-cygwin*) \
    974 @COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
     974@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
    975975@COMPILE_WITH_IPOPT_TRUE@   *-mingw*) \
    976 @COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
     976@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
    977977@COMPILE_WITH_IPOPT_TRUE@   *) \
    978 @COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/libifcasadi.so $(MC_LIB) ;; \
     978@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/libifcasadi.so $(TMP_MC_LIB) ;; \
    979979@COMPILE_WITH_IPOPT_TRUE@   esac
    980 @COMPILE_WITH_IPOPT64_TRUE@ rm -rf $(MC_LIB64)
    981 @COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(MC_LIB64)
    982 @COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB64)
    983 @COMPILE_WITH_IPOPT64_TRUE@ cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB64)
    984 @COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB64)
    985 @COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_BUILD64)/ifcasadi/ifcasadi.dll $(MC_LIB64)
     980@COMPILE_WITH_IPOPT64_TRUE@ rm -rf $(TMP_MC_LIB)
     981@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(TMP_MC_LIB)
     982@COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
     983@COMPILE_WITH_IPOPT64_TRUE@ cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
     984@COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
     985@COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_BUILD64)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB)
    986986
    987987mc_modelica: ifcasadi
     
    10011001$(OC_CASADI_BUILD)/bin/separateProcess.jar:  mc_optimica
    10021002
    1003 $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
    1004 
    1005 modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(MC_LIB)
    1006 @COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_BUILD)/modelicacasadi_wrapper; \
    1007 @COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/modelicacasadi_wrapper; \
     1003$(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
     1004
     1005modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(TMP_MC_LIB)
     1006@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
     1007@COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
    10081008@COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
    10091009@COMPILE_WITH_IPOPT_TRUE@   *-cygwin*|*-mingw*) \
    1010 @COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(CMAKE_CASADI_CXX_FLAG)" \
    1011 @COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
     1010@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)" \
     1011@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
    10121012@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    10131013@COMPILE_WITH_IPOPT_TRUE@       "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
    10141014@COMPILE_WITH_IPOPT_TRUE@   *) \
    10151015@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) \
    1016 @COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
     1016@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
    10171017@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    10181018@COMPILE_WITH_IPOPT_TRUE@       "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
    10191019@COMPILE_WITH_IPOPT_TRUE@   esac
    1020 @COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
     1020@COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
    10211021@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    10221022@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
    1023 @COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(MC_BUILD64)/modelicacasadi_wrapper; \
    1024 @COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/modelicacasadi_wrapper; \
    1025 @COMPILE_WITH_IPOPT64_TRUE@ cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CASADI_CXX_FLAG64)" -DCMAKE_CXX_FLAGS="$(CMAKE_CASADI_CXX_FLAG64)" \
    1026 @COMPILE_WITH_IPOPT64_TRUE@     -DMC_BUILD="$(MC_BUILD64)" -DIPOPT_HOME="$(IPOPT64_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR64)" \
     1023@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
     1024@COMPILE_WITH_IPOPT64_TRUE@ cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
     1025@COMPILE_WITH_IPOPT64_TRUE@ cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG64)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG64)" \
     1026@COMPILE_WITH_IPOPT64_TRUE@     -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT64_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
    10271027@COMPILE_WITH_IPOPT64_TRUE@     -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    10281028@COMPILE_WITH_IPOPT64_TRUE@     "$(CMAKE_PYTHON64_LIB)" "$(CMAKE_PYTHON64_INCLUDE)"; \
    1029 @COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
     1029@COMPILE_WITH_IPOPT64_TRUE@ cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
    10301030@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME);
    10311031@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     
    10361036 $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py: install_modelicacasadi_wrapper
    10371037
    1038  install_modelicacasadi_wrapper: $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
     1038 install_modelicacasadi_wrapper: $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
    10391039@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    1040 @COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
     1040@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    10411041@COMPILE_WITH_IPOPT_TRUE@   rm -f $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
    10421042@COMPILE_WITH_IPOPT_TRUE@   touch $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
     
    10451045@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME);
    10461046@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
    1047 @COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_BUILD64)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
     1047@COMPILE_WITH_IPOPT64_TRUE@ cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
    10481048@COMPILE_WITH_IPOPT64_TRUE@ rm -f $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper/__init__.py
    10491049@COMPILE_WITH_IPOPT64_TRUE@ touch $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper/__init__.py
Note: See TracChangeset for help on using the changeset viewer.