Commit 121e2f45 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

paths

parent 4ce300ef

.gitlab-ci.yml

+5 −1
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ build_windows: 
    - echo $BLD_DIR

    - cmake -S $SRC_DIR -B $BLD_DIR -Dsaline_ENABLE_Fortran=OFF -Dsaline_ENABLE_Python=ON -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE

    - cmake --build $BLD_DIR --target ALL_BUILD --config RELEASE

  artifacts:

    expire_in: 3 day

    paths:

      - "build/$CI_COMMIT_SHORT_SHA"



test windows:

  tags:
@@ -31,7 +35,7 @@ test windows: 
    - echo $SRC_DIR

    - echo $BLD_DIR

    - ls build

    - ctest --build-config RELEASE --test-dir $BLD_DIR

    - ctest --build-config RELEASE --test-dir /build/$CI_COMMIT_SHORT_SHA

  needs:

    - job: build_windows

src/python/setup.py

+13 −2
Original line number Diff line number Diff line
@@ -3,16 +3,27 @@ 
# need to be replaced with equivalent values.



from setuptools import Extension, setup

import platform



#TODO I think this can be replaced by some Cmake

def get_extra_link_args():

    if platform.system() == 'Windows':

        return []

    else:

        return ["-Wl,-rpath=$ORIGIN/lib/."]



#Nominally this is just one directory. This just  ensures it doesn't have to be.

incl_dirs = "$<TARGET_PROPERTY:saline-cpp,INCLUDE_DIRECTORIES>".split(";")

ext_obj_list = "$<TARGET_OBJECTS:saline-cpp>".split(";")



ext_mod = Extension("_SalinePy",

        #Generated by Swig during configuration

        sources            = ["SalinePy_wrap.cxx"],

        #Header files for the Saline C++ code

        include_dirs       = incl_dirs,

        extra_objects      = ext_obj_list,

#Technically this should be overridden with the compile options used by cmake...

        extra_compile_args = ["-std=c++11"],

        #Arguments for helping the linker and runtime loader

        extra_link_args = get_extra_link_args(),

        )



setup(