Changeset 14081


Ignore:
Timestamp:
Nov 15, 2019 2:04:25 PM (4 weeks ago)
Author:
randersson
Message:

#5819 Minor fix for directories being incorrect when building casadi on linux

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/MakefileCasadi.am

    r14079 r14081  
    6464
    6565else
     66case $(build) in \
     67*-cygwin*|*-mingw*) \
    6668TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)
    6769TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)
    68 TMP_CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG64)
    69 TMP_CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS64)
    70 
    71 # note we set directories to those without 64bit suffix
     70TMP_CASADI_INST_DIR=$(CASADI_INST_DIR64)
     71TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR64)
     72TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR64)
     73*) \
     74# for linux we dont have bitness as suffix on directories
     75TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)
     76TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)
    7277TMP_CASADI_INST_DIR=$(CASADI_INST_DIR)
    7378TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR)
    7479TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR)
     80esac
     81TMP_CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG64)
     82TMP_CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS64)
     83
     84# note we set directories to those without 64bit suffix
     85
    7586TMP_MC_LIB=$(MC_LIB64)
    7687TMP_MC_BUILD=$(MC_BUILD64)
Note: See TracChangeset for help on using the changeset viewer.