Changeset 13792


Ignore:
Timestamp:
Oct 21, 2019 5:09:35 PM (4 weeks ago)
Author:
aramle
Message:

#5819 Adding variable to be able to define Python base dir.

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

Legend:

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

    r13788 r13792  
    1313    case $(build) in \
    1414    *-cygwin*) \
    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) ;; \
     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) -PYTHON_BASE_DIR=Python ;; \
    1616    *-mingw*) \
    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) ;; \
     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) -PYTHON_BASE_DIR=Python ;; \
    1818    *-apple*) \
    1919    cmake -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
  • branches/dev-5819/Python/Makefile.in

    r13788 r13792  
    416416    case $(build) in \
    417417    *-cygwin*) \
    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) ;; \
     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) -PYTHON_BASE_DIR=Python ;; \
    419419    *-mingw*) \
    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) ;; \
     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) -PYTHON_BASE_DIR=Python ;; \
    421421    *-apple*) \
    422422    cmake -DCMAKE_INSTALL_DIR:PATH=$(prefix) $(TESTLIBRARY_SRC_DIR) -DTOP_SRC=$(abs_top_srcdir) ;; \
  • branches/dev-5819/Python/src/tests_jmodelica/files/Modelica/Resources/CMakeLists.txt

    r10171 r13792  
    2727
    2828#Make the directory for lib files to be installed in.
    29 if(" ${JM_PLATFORM} " MATCHES " win64 ")
     29if(PYTHON_BASE_DIR)
     30    set(TEST_LIBRARY_INSTALL_DIR ${JMODELICA_INSTALL_DIR}/${PYTHON_BASE_DIR}/tests_jmodelica/files/Modelica/Resources/Library/${JM_PLATFORM})
     31elseif(" ${JM_PLATFORM} " MATCHES " win64 ")
    3032    set(TEST_LIBRARY_INSTALL_DIR ${JMODELICA_INSTALL_DIR}/Python_64/tests_jmodelica/files/Modelica/Resources/Library/${JM_PLATFORM})
    3133else ()
Note: See TracChangeset for help on using the changeset viewer.