Changeset 14092


Ignore:
Timestamp:
Nov 18, 2019 8:45:23 AM (3 weeks ago)
Author:
randersson
Message:

#5819 Added changes from autoreconf

File:
1 edited

Legend:

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

    r13915 r14092  
    352352CMAKE_CASADI_CXX_FLAG64 = -m64
    353353CMAKE_CASADI_COMPILER_ARGS64 = -m64 -fpermissive
    354 @BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR64)
    355354@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR)
    356 @BUILD_WITH_PYTHON32_FALSE@TMP_SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR64)
    357355@BUILD_WITH_PYTHON32_TRUE@TMP_SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR)
    358356@BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG64)
     
    362360@BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS64)
    363361@BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS)
     362@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_INST_DIR = $(CASADI_INST_DIR)
     363@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR)
     364@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR)
    364365
    365366# note we set directories to those without 64bit suffix
    366 @BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_INST_DIR = $(CASADI_INST_DIR)
    367 @BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_INST_DIR = $(CASADI_INST_DIR)
    368 @BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR)
    369 @BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR)
    370 @BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR)
    371 @BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR)
    372367@BUILD_WITH_PYTHON32_FALSE@TMP_MC_LIB = $(MC_LIB64)
    373368@BUILD_WITH_PYTHON32_TRUE@TMP_MC_LIB = $(MC_LIB)
     
    907902
    908903
     904@BUILD_WITH_PYTHON32_FALSE@case $(build) in \
     905@BUILD_WITH_PYTHON32_FALSE@*-cygwin*|*-mingw*) \
     906@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64) \
     907@BUILD_WITH_PYTHON32_FALSE@TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64) \
     908@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_INST_DIR=$(CASADI_INST_DIR64) \
     909@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR64) \
     910@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR64) ;; \
     911@BUILD_WITH_PYTHON32_FALSE@*) \
     912@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR) \
     913@BUILD_WITH_PYTHON32_FALSE@TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR) \
     914@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_INST_DIR=$(CASADI_INST_DIR) \
     915@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR) \
     916@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR) ;; \
     917@BUILD_WITH_PYTHON32_FALSE@esac
     918
    909919.PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
    910920
Note: See TracChangeset for help on using the changeset viewer.