Changeset 13685


Ignore:
Timestamp:
Oct 7, 2019 3:42:44 PM (2 months ago)
Author:
randersson
Message:

#5819 Adding additional echo and creating a new layer in order to properly test change of variables for building only the 64bit, this will no longer cause error messages with variables that are changed during build since we now add the TMP_..., also note that this fix is far from final and is only a test to see if the correct gcc is used by doing this

Location:
branches/dev-5819
Files:
2 edited

Legend:

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

    r13684 r13685  
    6060    echo "CMAKE_PYTHON64_LIB:"
    6161    echo $(CMAKE_PYTHON64_LIB)
     62    echo "TMP_CMAKE_CASADI_CXX_FLAG:"
     63    echo $(TMP_CMAKE_CASADI_CXX_FLAG)
    6264    cd $(abs_builddir)/ThirdParty/CasADi; \
    63     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}"
     65    make -f Makefile  "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${TMP_CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${TMP_CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${TMP_CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${TMP_CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${TMP_CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${TMP_CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
    6466endif
    6567if COMPILE_WITH_IPOPT64
     
    8082if COMPILE_WITH_IPOPT
    8183    cd $(abs_builddir)/ThirdParty/CasADi; \
    82     make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
     84    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
    8385    mkdir -p $(DESTDIR)$(prefix)/Python/
    84     cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
     86    cp -r $(TMP_CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
    8587    ## temp fix
    86     cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
     88    cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
    8789endif
    8890if COMPILE_WITH_IPOPT64 
     
    139141BUILD_WITH_PYTHON32_ARG=--force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2"
    140142DEP_SUFFIX=
     143TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)
     144TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)
     145TMP_CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG)
     146TMP_CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS)
     147
     148TMP_CASADI_INST_DIR=$(CASADI_INST_DIR)
     149TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR)
     150TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR)
     151TMP_MC_LIB=$(MC_LIB)
     152TMP_MC_BUILD=$(MC_BUILD)
    141153else
    142154BUILD_WITH_PYTHON32_ARG=
    143155DEP_SUFFIX=64
    144 CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)
    145 SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)
    146 CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG64)
    147 CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS64)
    148 
    149 CASADI_INST_DIR=$(CASADI_INST_DIR64)
    150 CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR64)
    151 CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR64)
    152 MC_LIB=$(MC_LIB64)
    153 MC_BUILD=$(MC_BUILD64)
    154 COMPILE_WITH_IPOPT=$(COMPILE_WITH_IPOPT64)
    155 COMPILE_WITH_IPOPT64=
    156 IPOPT_HOME=$(IPOPT64_HOME)
     156TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)
     157TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)
     158TMP_CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG64)
     159TMP_CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS64)
     160
     161TMP_CASADI_INST_DIR=$(CASADI_INST_DIR64)
     162TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR64)
     163TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR64)
     164TMP_MC_LIB=$(MC_LIB64)
     165TMP_MC_BUILD=$(MC_BUILD64)
     166
    157167
    158168#CMAKE_PYTHON_INCLUDE=$(CMAKE_PYTHON64_INCLUDE)
  • branches/dev-5819/Makefile.in

    r13684 r13685  
    174174IPOPT64_INC = @IPOPT64_INC@
    175175IPOPT64_LIB = @IPOPT64_LIB@
    176 @BUILD_WITH_PYTHON32_FALSE@IPOPT_HOME = $(IPOPT64_HOME)
    177176IPOPT_HOME = @IPOPT_HOME@
    178177IPOPT_INC = @IPOPT_INC@
     
    317316MC_CASADI_BUILD = $(abs_builddir)/ModelicaCompilerCasADi
    318317OC_CASADI_BUILD = $(abs_builddir)/OptimicaCompilerCasADi
    319 @BUILD_WITH_PYTHON32_FALSE@MC_BUILD = $(MC_BUILD64)
    320318
    321319# The modelica casadi interface is built into a build folder
     
    324322# Jars from the modified modelica and optimica compilers are put into the JModelica folder
    325323MC_COMPILERS_DIR = $(MC_BUILD)/JModelica.org
    326 @BUILD_WITH_PYTHON32_FALSE@MC_LIB = $(MC_LIB64)
    327324MC_LIB = $(DESTDIR)$(prefix)/lib/casadi_interface
    328325MC_LIB64 = $(DESTDIR)$(prefix)/lib/casadi_interface64
    329 @BUILD_WITH_PYTHON32_FALSE@CASADI_BUILD_DIR = $(CASADI_BUILD_DIR64)
    330326CASADI_BUILD_DIR = $(abs_builddir)/casadi_build
    331327CASADI_BUILD_DIR64 = $(abs_builddir)/casadi_build64
    332 @BUILD_WITH_PYTHON32_FALSE@SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR64)
    333328SWIGCHECK_BUILD_DIR = $(abs_builddir)/swig_check
    334329SWIGCHECK_BUILD_DIR64 = $(abs_builddir)/swig_check64
    335 @BUILD_WITH_PYTHON32_FALSE@CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR64)
    336330CASADI_PYTHON_INST_DIR = $(abs_builddir)/casadi_install
    337 @BUILD_WITH_PYTHON32_FALSE@CASADI_INST_DIR = $(CASADI_INST_DIR64)
    338331CASADI_INST_DIR = $(prefix)/ThirdParty/CasADi
    339 @BUILD_WITH_PYTHON32_FALSE@CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR64)
    340332CASADI_PLUGIN_INST_DIR = $(CASADI_INST_DIR)/lib
    341333CASADI_PYTHON_INST_DIR64 = $(abs_builddir)/casadi_install64
    342334CASADI_INST_DIR64 = $(prefix)/ThirdParty/CasADi64
    343335CASADI_PLUGIN_INST_DIR64 = $(CASADI_INST_DIR64)/lib
    344 @BUILD_WITH_PYTHON32_FALSE@CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG64)
    345336CMAKE_CASADI_CXX_FLAG = -m32
    346 @BUILD_WITH_PYTHON32_FALSE@CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS64)
    347337CMAKE_CASADI_COMPILER_ARGS = -m32 -mincoming-stack-boundary=2
    348338CMAKE_CASADI_CXX_FLAG64 = -m64
     
    352342@BUILD_WITH_PYTHON32_FALSE@DEP_SUFFIX = 64
    353343@BUILD_WITH_PYTHON32_TRUE@DEP_SUFFIX =
    354 @BUILD_WITH_PYTHON32_FALSE@COMPILE_WITH_IPOPT = $(COMPILE_WITH_IPOPT64)
    355 @BUILD_WITH_PYTHON32_FALSE@COMPILE_WITH_IPOPT64 =
     344@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR64)
     345@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR)
     346@BUILD_WITH_PYTHON32_FALSE@TMP_SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR64)
     347@BUILD_WITH_PYTHON32_TRUE@TMP_SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR)
     348@BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG64)
     349@BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG)
     350@BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS64)
     351@BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS)
     352@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_INST_DIR = $(CASADI_INST_DIR64)
     353@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_INST_DIR = $(CASADI_INST_DIR)
     354@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR64)
     355@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR)
     356@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR64)
     357@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR)
     358@BUILD_WITH_PYTHON32_FALSE@TMP_MC_LIB = $(MC_LIB64)
     359@BUILD_WITH_PYTHON32_TRUE@TMP_MC_LIB = $(MC_LIB)
     360@BUILD_WITH_PYTHON32_FALSE@TMP_MC_BUILD = $(MC_BUILD64)
     361@BUILD_WITH_PYTHON32_TRUE@TMP_MC_BUILD = $(MC_BUILD)
    356362@NUMPY_NO_MSVCR_FALSE@NUMPY_NO_MSVCR_ARG =
    357363@NUMPY_NO_MSVCR_TRUE@NUMPY_NO_MSVCR_ARG = --no-msvcr="true"
     
    895901@COMPILE_WITH_IPOPT_TRUE@   echo "CMAKE_PYTHON64_LIB:"
    896902@COMPILE_WITH_IPOPT_TRUE@   echo $(CMAKE_PYTHON64_LIB)
     903@COMPILE_WITH_IPOPT_TRUE@   echo "TMP_CMAKE_CASADI_CXX_FLAG:"
     904@COMPILE_WITH_IPOPT_TRUE@   echo $(TMP_CMAKE_CASADI_CXX_FLAG)
    897905@COMPILE_WITH_IPOPT_TRUE@   cd $(abs_builddir)/ThirdParty/CasADi; \
    898 @COMPILE_WITH_IPOPT_TRUE@   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}"
     906@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile  "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${TMP_CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${TMP_CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${TMP_CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${TMP_CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${TMP_CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${TMP_CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
    899907@COMPILE_WITH_IPOPT64_TRUE@ echo "I am in COMPILE_WITH_IPOPT64"
    900908@COMPILE_WITH_IPOPT64_TRUE@ echo "1 2 3 4 - IPOPT_HOME:"
     
    911919install_casadi: casadi
    912920@COMPILE_WITH_IPOPT_TRUE@   cd $(abs_builddir)/ThirdParty/CasADi; \
    913 @COMPILE_WITH_IPOPT_TRUE@   make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
     921@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile install "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
    914922@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python/
    915 @COMPILE_WITH_IPOPT_TRUE@   cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
    916 @COMPILE_WITH_IPOPT_TRUE@   cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
     923@COMPILE_WITH_IPOPT_TRUE@   cp -r $(TMP_CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
     924@COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
    917925@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    918926@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); 
Note: See TracChangeset for help on using the changeset viewer.