Changeset 13662


Ignore:
Timestamp:
Oct 3, 2019 3:45:33 PM (2 months ago)
Author:
randersson
Message:

#5819 Adding automated changes from Makefile.am to Makefile.in, related to r13656

File:
1 edited

Legend:

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

    r13651 r13662  
    141141CMAKE_PYTHON64_INCLUDE = @CMAKE_PYTHON64_INCLUDE@
    142142CMAKE_PYTHON64_LIB = @CMAKE_PYTHON64_LIB@
     143@BUILD_WITH_PYTHON32_FALSE@CMAKE_PYTHON_INCLUDE = $(CMAKE_PYTHON64_INCLUDE)
    143144CMAKE_PYTHON_INCLUDE = @CMAKE_PYTHON_INCLUDE@
     145@BUILD_WITH_PYTHON32_FALSE@CMAKE_PYTHON_LIB = $(CMAKE_PYTHON_LIB64)
    144146CMAKE_PYTHON_LIB = @CMAKE_PYTHON_LIB@
    145147CP = @CP@
     
    174176IPOPT64_INC = @IPOPT64_INC@
    175177IPOPT64_LIB = @IPOPT64_LIB@
     178@BUILD_WITH_PYTHON32_FALSE@IPOPT_HOME = $(IPOPT64_HOME)
    176179IPOPT_HOME = @IPOPT_HOME@
    177180IPOPT_INC = @IPOPT_INC@
     
    316319MC_CASADI_BUILD = $(abs_builddir)/ModelicaCompilerCasADi
    317320OC_CASADI_BUILD = $(abs_builddir)/OptimicaCompilerCasADi
     321@BUILD_WITH_PYTHON32_FALSE@MC_BUILD = $(MC_BUILD64)
    318322
    319323# The modelica casadi interface is built into a build folder
     
    322326# Jars from the modified modelica and optimica compilers are put into the JModelica folder
    323327MC_COMPILERS_DIR = $(MC_BUILD)/JModelica.org
     328@BUILD_WITH_PYTHON32_FALSE@MC_LIB = $(MC_LIB64)
    324329MC_LIB = $(DESTDIR)$(prefix)/lib/casadi_interface
    325330MC_LIB64 = $(DESTDIR)$(prefix)/lib/casadi_interface64
     331@BUILD_WITH_PYTHON32_FALSE@CASADI_BUILD_DIR = $(CASADI_BUILD_DIR64)
    326332CASADI_BUILD_DIR = $(abs_builddir)/casadi_build
    327333CASADI_BUILD_DIR64 = $(abs_builddir)/casadi_build64
     334@BUILD_WITH_PYTHON32_FALSE@SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR64)
    328335SWIGCHECK_BUILD_DIR = $(abs_builddir)/swig_check
    329336SWIGCHECK_BUILD_DIR64 = $(abs_builddir)/swig_check64
     337@BUILD_WITH_PYTHON32_FALSE@CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR64)
    330338CASADI_PYTHON_INST_DIR = $(abs_builddir)/casadi_install
     339@BUILD_WITH_PYTHON32_FALSE@CASADI_INST_DIR = $(CASADI_INST_DIR64)
    331340CASADI_INST_DIR = $(prefix)/ThirdParty/CasADi
     341@BUILD_WITH_PYTHON32_FALSE@CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR64)
    332342CASADI_PLUGIN_INST_DIR = $(CASADI_INST_DIR)/lib
    333343CASADI_PYTHON_INST_DIR64 = $(abs_builddir)/casadi_install64
    334344CASADI_INST_DIR64 = $(prefix)/ThirdParty/CasADi64
    335345CASADI_PLUGIN_INST_DIR64 = $(CASADI_INST_DIR64)/lib
     346@BUILD_WITH_PYTHON32_FALSE@CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG64)
    336347CMAKE_CASADI_CXX_FLAG = -m32
     348@BUILD_WITH_PYTHON32_FALSE@CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS64)
    337349CMAKE_CASADI_COMPILER_ARGS = -m32 -mincoming-stack-boundary=2
    338350CMAKE_CASADI_CXX_FLAG64 = -m64
    339351CMAKE_CASADI_COMPILER_ARGS64 = -m64 -fpermissive
    340 @NUMPY_NO_MSVCR_FALSE@NUMPY_NO_MSVCR_ARG =
    341 @NUMPY_NO_MSVCR_TRUE@NUMPY_NO_MSVCR_ARG = --no-msvcr="true"
    342352@BUILD_WITH_PYTHON32_FALSE@BUILD_WITH_PYTHON32_ARG =
    343353@BUILD_WITH_PYTHON32_TRUE@BUILD_WITH_PYTHON32_ARG = --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2"
    344354@BUILD_WITH_PYTHON32_FALSE@DEP_SUFFIX = 64
    345355@BUILD_WITH_PYTHON32_TRUE@DEP_SUFFIX =
     356@BUILD_WITH_PYTHON32_FALSE@COMPILE_WITH_IPOPT = $(COMPILE_WITH_IPOPT64)
     357@BUILD_WITH_PYTHON32_FALSE@COMPILE_WITH_IPOPT64 =
     358@BUILD_WITH_PYTHON32_FALSE@CMAKE_CASADI_ARGS = $(CMAKE_CASADI_ARGS64)
     359@NUMPY_NO_MSVCR_FALSE@NUMPY_NO_MSVCR_ARG =
     360@NUMPY_NO_MSVCR_TRUE@NUMPY_NO_MSVCR_ARG = --no-msvcr="true"
    346361
    347362# Hooks for extra build or install actions. Must be empty or the path of a shell script to execute.
     
    905920@COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
    906921@COMPILE_WITH_IPOPT_TRUE@   *-cygwin*|*-mingw*) \
    907 @COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
     922@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)" \
    908923@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
    909924@COMPILE_WITH_IPOPT_TRUE@   *) \
     
    916931@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(MC_BUILD64)/ifcasadi; \
    917932@COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/ifcasadi; \
    918 @COMPILE_WITH_IPOPT64_TRUE@ cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m64" -DCMAKE_CXX_FLAGS="-m64" \
     933@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)" \
    919934@COMPILE_WITH_IPOPT64_TRUE@     -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR64)"; \
    920935@COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/ifcasadi;  make
     
    966981@COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
    967982@COMPILE_WITH_IPOPT_TRUE@   *-cygwin*|*-mingw*) \
    968 @COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
     983@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)" \
    969984@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
    970985@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
     
    981996@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(MC_BUILD64)/modelicacasadi_wrapper; \
    982997@COMPILE_WITH_IPOPT64_TRUE@ cd $(MC_BUILD64)/modelicacasadi_wrapper; \
    983 @COMPILE_WITH_IPOPT64_TRUE@ cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m64" -DCMAKE_CXX_FLAGS="-m64" \
     998@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)" \
    984999@COMPILE_WITH_IPOPT64_TRUE@     -DMC_BUILD="$(MC_BUILD64)" -DIPOPT_HOME="$(IPOPT64_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR64)" \
    9851000@COMPILE_WITH_IPOPT64_TRUE@     -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
Note: See TracChangeset for help on using the changeset viewer.