Ignore:
Timestamp:
Sep 17, 2015 2:39:13 PM (4 years ago)
Author:
Jonathan Kämpe
Message:

#4578 Merge r8031 to release branch 1.16.x.

Location:
branches/1.16.x
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.16.x

    • Property svn:mergeinfo changed
      /trunkmerged: 8031
  • branches/1.16.x/Makefile.am

    r7986 r8034  
    4949
    5050export CASADI_HOME=$(abs_top_srcdir)/ThirdParty/CasADi/CasADi
    51 MC_SRC=$(abs_top_srcdir)/Compiler/ModelicaCompilerCasADi
    52 OC_SRC=$(abs_top_srcdir)/Compiler/OptimicaCompilerCasADi
     51MC_SRC="$(JAVA_CASADI_BASE_DIR)/ModelicaCompilerCasADi"
     52OC_SRC=$(JAVA_CASADI_BASE_DIR)/OptimicaCompilerCasADi
     53MC_SRC_SWIG=$(abs_top_srcdir)/Compiler/ModelicaCompilerCasADi/src/swig
     54
     55# Export location to put the 'ifcasadi' directory containing java files generated by swig
     56export IFCASADI_OUTDIR=$(MC_SRC)
     57
     58# Export basedir where the casadi interface jcc generation can find
     59# compiler jars, also unquote.
     60export IFCASADI_JAR_BASE=$(shell echo $(JAVA_CASADI_BASE_DIR))
    5361
    5462# The modelica casadi interface is built into a build folder
     
    7987    case $(build) in \
    8088    *-cygwin*) \
    81     cmake $(MC_SRC)/src/swig -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" ;; \
    82     *-mingw*) \
    83     cmake $(MC_SRC)/src/swig -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" ;; \
    84     *) \
    85     cmake $(MC_SRC)/src/swig ;; \
     89    cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" ;; \
     90    *-mingw*) \
     91    cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" ;; \
     92    *) \
     93    cmake $(MC_SRC_SWIG) ;; \
    8694    esac
    8795    cd $(MC_BUILD)/ifcasadi;  make
     
    265273JAVA_MC_ANT_FILE=$(COMPILER_DIR)/ModelicaCompiler/build.xml
    266274JAVA_OC_ANT_FILE=$(COMPILER_DIR)/OptimicaCompiler/build.xml
     275JAVA_CASADI_BASE_DIR=$(COMPILER_DIR)
    267276JAVA_EXEC_CP=$(JAVA_BUILD_DIR)/bin/ModelicaCompiler.jar:$(JAVA_BUILD_DIR)/bin/util.jar:$(abs_top_srcdir)/ThirdParty/Beaver/beaver-0.9.6.1/lib/beaver-rt.jar
    268277
     
    422431#   rm -rf $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer
    423432if HAVE_ANT
    424     cd $(abs_top_srcdir)/Compiler/ModelicaCompilerCasADi; \
     433    cd $(JAVA_CASADI_BASE_DIR)/ModelicaCompilerCasADi; \
    425434    $(ANT_OPTS) $(ANT) clean ; rm -rf $(MC_SRC)/src/cpp-generated $(MC_SRC)/src/java-generated/ifcasadi
    426     cd $(abs_top_srcdir)/Compiler/OptimicaCompilerCasADi; \
     435    cd $(JAVA_CASADI_BASE_DIR)/OptimicaCompilerCasADi; \
    427436    $(ANT_OPTS) $(ANT) clean ; rm -rf $(OC_SRC)/src/cpp-generated $(OC_SRC)/src/java-generated/ifcasadi
    428437endif
Note: See TracChangeset for help on using the changeset viewer.