From 47dd0eeead0260520d019ba834d5ce02f8774e61 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Wed, 12 Dec 2018 04:41:18 -0800 Subject: [PATCH] Fixes --- .gitlab-ci.yml | 2 +- external_dependencies/pybind11 | 2 +- libsrc/core/CMakeLists.txt | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f88a9bb..1d14fa9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,7 +144,7 @@ test_ubuntu: test_guidelines: stage: test script: - - docker run netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id -e CCACHE_DIR=/ccache -v /mnt/ccache:/ccache netgen_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} bash /root/src/netgen/tests/build_guidelines.sh + - docker run -e CCACHE_DIR=/ccache -v /mnt/ccache:/ccache netgen_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} bash /root/src/netgen/tests/build_guidelines.sh when: always ############################################ # Deploy stage diff --git a/external_dependencies/pybind11 b/external_dependencies/pybind11 index 2a150736..e0f3a766 160000 --- a/external_dependencies/pybind11 +++ b/external_dependencies/pybind11 @@ -1 +1 @@ -Subproject commit 2a150736601bb3113877bb673fb934bb60d46ec5 +Subproject commit e0f3a766e951ebbf2aadb31f41eb490de5bb607e diff --git a/libsrc/core/CMakeLists.txt b/libsrc/core/CMakeLists.txt index 337bbfaa..9de7701f 100644 --- a/libsrc/core/CMakeLists.txt +++ b/libsrc/core/CMakeLists.txt @@ -1,7 +1,5 @@ +add_library(ngcore SHARED archive.cpp version.cpp) -add_library(ngcore archive.cpp version.cpp) - -set_target_properties(ngcore PROPERTIES POSITION_INDEPENDENT_CODE ON ) target_compile_definitions(ngcore PRIVATE -DNGCORE_EXPORTS) install(TARGETS ngcore DESTINATION ${NG_INSTALL_DIR} COMPONENT netgen)