Changeset 13723


Ignore:
Timestamp:
Oct 10, 2019 4:22:56 PM (6 weeks ago)
Author:
Jonathan Kämpe
Message:

#5844 Variable definitions in casadi makefile

Location:
branches/dev-jk-2471-2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-jk-2471-2/Makefile.in

    r13722 r13723  
    879879
    880880
     881.PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
     882
    881883casadi:
    882884@COMPILE_WITH_IPOPT_TRUE@   cd $(abs_builddir)/ThirdParty/CasADi; \
     
    10411043@HAVE_ANT_TRUE@ cd $(JAVA_CASADI_BUILD_DIR)/OptimicaCompilerCasADi; \
    10421044@HAVE_ANT_TRUE@ $(ANT_OPTS) $(ANT) clean ; rm -rf $(OC_CASADI_BUILD)/src/cpp-generated $(OC_CASADI_BUILD)/src/generated/optimica/java/ifcasadi
    1043 
    1044 .PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
    10451045
    10461046build-python-packages:
  • branches/dev-jk-2471-2/MakefileCasadi.am

    r13722 r13723  
    1313#     <http://www.ibm.com/developerworks/library/os-cpl.html/>.
    1414
    15 casadi:
    16 if COMPILE_WITH_IPOPT
    17     cd $(abs_builddir)/ThirdParty/CasADi; \
    18     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}"
    19 endif
    20 if COMPILE_WITH_IPOPT64
    21     export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    22     export PYTHONHOME=$(PYTHON64_HOME); \
    23     cd $(abs_builddir)/ThirdParty/CasADi; \
    24     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}"
    25     export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    26     export PATH="$(ORIG_PATH)";
    27 endif
    28 
    29 install_casadi: casadi
    30 if COMPILE_WITH_IPOPT
    31     cd $(abs_builddir)/ThirdParty/CasADi; \
    32     make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
    33     mkdir -p $(DESTDIR)$(prefix)/Python/
    34     cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
    35     ## temp fix
    36     cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
    37 endif
    38 if COMPILE_WITH_IPOPT64 
    39     export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    40     export PYTHONHOME=$(PYTHON64_HOME); 
    41     cd $(abs_builddir)/ThirdParty/CasADi; \
    42     make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
    43     mkdir -p $(DESTDIR)$(prefix)/Python/
    44     cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
    45     ## temp fix
    46     cp $(CASADI_BUILD_DIR64)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
    47     export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    48     export PATH="$(ORIG_PATH)";
    49 endif
    5015## Install for CasADiInterface, Variables and targets.
    5116## MC_interface installs the system with Python.
     
    8449CMAKE_CASADI_CXX_FLAG64=-m64
    8550CMAKE_CASADI_COMPILER_ARGS64=-m64 -fpermissive
     51
     52.PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
     53
     54casadi:
     55if COMPILE_WITH_IPOPT
     56    cd $(abs_builddir)/ThirdParty/CasADi; \
     57    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}"
     58endif
     59if COMPILE_WITH_IPOPT64
     60    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     61    export PYTHONHOME=$(PYTHON64_HOME); \
     62    cd $(abs_builddir)/ThirdParty/CasADi; \
     63    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}"
     64    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
     65    export PATH="$(ORIG_PATH)";
     66endif
     67
     68install_casadi: casadi
     69if COMPILE_WITH_IPOPT
     70    cd $(abs_builddir)/ThirdParty/CasADi; \
     71    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
     72    mkdir -p $(DESTDIR)$(prefix)/Python/
     73    cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
     74    ## temp fix
     75    cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
     76endif
     77if COMPILE_WITH_IPOPT64 
     78    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     79    export PYTHONHOME=$(PYTHON64_HOME); 
     80    cd $(abs_builddir)/ThirdParty/CasADi; \
     81    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
     82    mkdir -p $(DESTDIR)$(prefix)/Python/
     83    cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
     84    ## temp fix
     85    cp $(CASADI_BUILD_DIR64)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python_64/casadi
     86    export PYTHONHOME=$(ORIG_PYTHON_HOME); \
     87    export PATH="$(ORIG_PATH)";
     88endif
    8689
    8790casadi_interface: install_casadi_interface
     
    245248endif
    246249   
    247 
    248 .PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
Note: See TracChangeset for help on using the changeset viewer.