Ignore:
Timestamp:
Mar 26, 2019 10:57:50 AM (9 months ago)
Author:
molsson
Message:

AUTO catchup merge from trunk to branches/dev-1526

Location:
branches/dev-1526
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-1526

  • branches/dev-1526/Makefile.am

    r12302 r12537  
    4444
    4545casadi:
     46if COMPILE_WITH_IPOPT
    4647    cd $(abs_builddir)/ThirdParty/CasADi; \
    4748    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}"
     49endif
    4850if COMPILE_WITH_IPOPT64
    4951    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     
    5658
    5759install_casadi: casadi
     60if COMPILE_WITH_IPOPT
    5861    cd $(abs_builddir)/ThirdParty/CasADi; \
    5962    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
     
    6265    ## temp fix
    6366    cp $(abs_builddir)/casadi_build/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
     67endif
    6468if COMPILE_WITH_IPOPT64 
    6569    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     
    117121
    118122ifcasadi: casadi
     123if COMPILE_WITH_IPOPT
    119124    mkdir -p $(MC_BUILD)/ifcasadi; \
    120125    cd $(MC_BUILD)/ifcasadi; \
     
    128133    esac
    129134    cd $(MC_BUILD)/ifcasadi;  make
     135endif
    130136if COMPILE_WITH_IPOPT64
    131137    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}";
     
    141147
    142148$(MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
     149if COMPILE_WITH_IPOPT
    143150    rm -rf $(MC_LIB)
    144151    mkdir -p $(MC_LIB)
     
    153160    *) \
    154161    cp $(MC_BUILD)/ifcasadi/libifcasadi.so $(MC_LIB) ;; \
    155     esac
     162    esac
     163endif
    156164if COMPILE_WITH_IPOPT64
    157165    rm -rf $(MC_LIB64)
     
    183191
    184192modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(MC_LIB)
     193if COMPILE_WITH_IPOPT
    185194    mkdir -p $(MC_BUILD)/modelicacasadi_wrapper; \
    186195    cd $(MC_BUILD)/modelicacasadi_wrapper; \
     
    198207    esac
    199208    cd $(MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
     209endif
    200210if COMPILE_WITH_IPOPT64
    201211    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     
    218228 
    219229 install_modelicacasadi_wrapper: $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
     230if COMPILE_WITH_IPOPT
    220231    mkdir -p $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    221232    cp $(MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
     
    223234    touch $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
    224235    echo "from modelicacasadi_wrapper import *" >> $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
     236endif
    225237if COMPILE_WITH_IPOPT64
    226238    export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
     
    236248
    237249 install_modelicacasadi_transfer: $(MC_INTERFACE)/python/modelica_casadi_transfer_wrapper.py
     250if COMPILE_WITH_IPOPT
    238251    mkdir -p $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer
    239252    rm -f $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py
     
    241254    echo "from modelica_casadi_transfer_wrapper import *" >> $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py
    242255    cp $(MC_INTERFACE)/python/modelica_casadi_transfer_wrapper.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer
     256endif
    243257if COMPILE_WITH_IPOPT64   
    244258    mkdir -p $(DESTDIR)$(prefix)/Python_64/modelicacasadi_transfer
Note: See TracChangeset for help on using the changeset viewer.