Ignore:
Timestamp:
Oct 15, 2019 1:59:55 PM (8 weeks ago)
Author:
randersson
Message:

#5819 Updated paths for previous generation of JM to be correct. Note these are not used when build with python 3 anyway.

File:
1 edited

Legend:

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

    r13749 r13754  
    920920@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
    921921@COMPILE_WITH_IPOPT64_TRUE@ cd $(abs_builddir)/ThirdParty/CasADi; \
    922 @COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile  "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT64_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_PYTHON64_LIB}" "CMAKE_PYTHON_INCLUDE=${CMAKE_PYTHON64_INCLUDE}"
     922@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}"
    923923@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    924924@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     
    933933@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); 
    934934@COMPILE_WITH_IPOPT64_TRUE@ cd $(abs_builddir)/ThirdParty/CasADi; \
    935 @COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT64_HOME)"
     935@COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
    936936@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python/
    937 @COMPILE_WITH_IPOPT64_TRUE@ cp -r $(TMP_CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python_64/
    938 @COMPILE_WITH_IPOPT64_TRUE@ cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
     937@COMPILE_WITH_IPOPT64_TRUE@ cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
     938@COMPILE_WITH_IPOPT64_TRUE@ cp $(CASADI_BUILD_DIR64)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
    939939@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    940940@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     
    959959@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}";
    960960@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME);
    961 @COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
    962 @COMPILE_WITH_IPOPT64_TRUE@ cd $(TMP_MC_BUILD)/ifcasadi; \
    963 @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)" \
    964 @COMPILE_WITH_IPOPT64_TRUE@     -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)"; \
    965 @COMPILE_WITH_IPOPT64_TRUE@ cd $(TMP_MC_BUILD)/ifcasadi;  make
     961@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(MC_BUILD64)/ifcasadi; \
     962@COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/ifcasadi; \
     963@COMPILE_WITH_IPOPT64_TRUE@ cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m64" -DCMAKE_CXX_FLAGS="-m64" \
     964@COMPILE_WITH_IPOPT64_TRUE@     -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR64)"; \
     965@COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/ifcasadi;  make
    966966@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    967967@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     
    981981@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/libifcasadi.so $(TMP_MC_LIB) ;; \
    982982@COMPILE_WITH_IPOPT_TRUE@   esac
    983 @COMPILE_WITH_IPOPT64_TRUE@ rm -rf $(TMP_MC_LIB)
    984 @COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(TMP_MC_LIB)
    985 @COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
    986 @COMPILE_WITH_IPOPT64_TRUE@ cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
    987 @COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
    988 @COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_BUILD64)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB)
     983@COMPILE_WITH_IPOPT64_TRUE@ rm -rf $(MC_LIB64)
     984@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(MC_LIB64)
     985@COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB64)
     986@COMPILE_WITH_IPOPT64_TRUE@ cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB64)
     987@COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB64)
     988@COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_BUILD64)/ifcasadi/ifcasadi.dll $(MC_LIB64)
    989989
    990990mc_modelica: ifcasadi
     
    10241024@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    10251025@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
    1026 @COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
    1027 @COMPILE_WITH_IPOPT64_TRUE@ cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
    1028 @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)" \
    1029 @COMPILE_WITH_IPOPT64_TRUE@     -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT64_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
     1026@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(MC_BUILD64)/modelicacasadi_wrapper; \
     1027@COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/modelicacasadi_wrapper; \
     1028@COMPILE_WITH_IPOPT64_TRUE@ cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m64" -DCMAKE_CXX_FLAGS="-m64" \
     1029@COMPILE_WITH_IPOPT64_TRUE@     -DMC_BUILD="$(MC_BUILD64)" -DIPOPT_HOME="$(IPOPT64_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR64)" \
    10301030@COMPILE_WITH_IPOPT64_TRUE@     -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    10311031@COMPILE_WITH_IPOPT64_TRUE@     "$(CMAKE_PYTHON64_LIB)" "$(CMAKE_PYTHON64_INCLUDE)"; \
    1032 @COMPILE_WITH_IPOPT64_TRUE@ cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
     1032@COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
    10331033@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME);
    10341034@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     
    10481048@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME);
    10491049@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
    1050 @COMPILE_WITH_IPOPT64_TRUE@ cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
     1050@COMPILE_WITH_IPOPT64_TRUE@ cp $(MC_BUILD64)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper
    10511051@COMPILE_WITH_IPOPT64_TRUE@ rm -f $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper/__init__.py
    10521052@COMPILE_WITH_IPOPT64_TRUE@ touch $(DESTDIR)$(prefix)/Python_64/modelicacasadi_wrapper/__init__.py
Note: See TracChangeset for help on using the changeset viewer.