Changeset 13788


Ignore:
Timestamp:
Oct 21, 2019 3:46:26 PM (4 weeks ago)
Author:
aramle
Message:

#5819 Updating Python makefile to accomodate for external resources being built with win64 now.

Location:
branches/dev-5819/Python
Files:
2 edited

Legend:

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

    r10167 r13788  
    22TESTLIBRARY_SRC_DIR=$(abs_top_srcdir)/Python
    33TESTLIBRARY_BUILD_DIR64=$(abs_builddir)/build64
     4if BUILD_WITH_PYTHON32
     5TESTLIBRARY_CMAKE_FLAG="-m32"
     6else
     7TESTLIBRARY_CMAKE_FLAG="-m64"
     8endif
    49
    510$(TESTLIBRARY_BUILD_DIR):
     
    813    case $(build) in \
    914    *-cygwin*) \
    10     cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS="-m32" -DCMAKE_Fortran_FLAGS="-m32" -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
     15    cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
    1116    *-mingw*) \
    12     cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS="-m32" -DCMAKE_Fortran_FLAGS="-m32" -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
     17    cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
    1318    *-apple*) \
    1419    cmake -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
  • branches/dev-5819/Python/Makefile.in

    r11950 r13788  
    215215TESTLIBRARY_SRC_DIR = $(abs_top_srcdir)/Python
    216216TESTLIBRARY_BUILD_DIR64 = $(abs_builddir)/build64
     217@BUILD_WITH_PYTHON32_FALSE@TESTLIBRARY_CMAKE_FLAG = "-m64"
     218@BUILD_WITH_PYTHON32_TRUE@TESTLIBRARY_CMAKE_FLAG = "-m32"
    217219all: all-am
    218220
     
    414416    case $(build) in \
    415417    *-cygwin*) \
    416     cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS="-m32" -DCMAKE_Fortran_FLAGS="-m32" -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
     418    cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
    417419    *-mingw*) \
    418     cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS="-m32" -DCMAKE_Fortran_FLAGS="-m32" -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
     420    cmake -G "MSYS Makefiles" -DCMAKE_C_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_Fortran_FLAGS=$(TESTLIBRARY_CMAKE_FLAG) -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
    419421    *-apple*) \
    420422    cmake -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
Note: See TracChangeset for help on using the changeset viewer.