diff --git a/share/python/CMakeLists.txt b/share/python/CMakeLists.txt index 4b5e88dd..110776f0 100755 --- a/share/python/CMakeLists.txt +++ b/share/python/CMakeLists.txt @@ -47,7 +47,7 @@ PROJECT (${PROJECT_NAME} VERSION ${PROJECT_VERSION_STRING} LANGUAGES "C" "CXX") ### Boost [1.67.0] -SET (Boost_USE_STATIC_LIBS ON) +SET (Boost_USE_STATIC_LIBS OFF) SET (Boost_USE_MULTITHREADED ON) UNSET (Boost_INCLUDE_DIR CACHE) @@ -126,6 +126,7 @@ ADD_CUSTOM_COMMAND (OUTPUT ${OUTPUT} COMMAND mkdir -p "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}" COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/tools/python/Library/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/Library/__init__.py" COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/tools/python/${PROJECT_PATH}/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/__init__.py" + COMMAND cp "/usr/local/lib/libboost_python36.so.1.68.0" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/libboost_python36.so.1.68.0" COMMAND cp "${CMAKE_SOURCE_DIR}/lib/${SHARED_LIBRARY_TARGET}" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/liblibrary-core.so.0" COMMAND cp "${CMAKE_SOURCE_DIR}/lib/${LIBRARY_TARGET}" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/LibraryCorePy.so" COMMAND ${PYTHON} ${SETUP_PY} bdist_wheel diff --git a/share/python/tools/python/setup.py.in b/share/python/tools/python/setup.py.in index 2191a183..1fe2ec17 100644 --- a/share/python/tools/python/setup.py.in +++ b/share/python/tools/python/setup.py.in @@ -20,5 +20,5 @@ setuptools.setup( ), keywords="open-space-collective core", packages=setuptools.find_packages(), - package_data={"": ["${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/LibraryCorePy.so", "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/liblibrary-core.so.0"]} + package_data={"": ["${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/LibraryCorePy.so", "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/liblibrary-core.so.0", "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_PATH}/libboost_python36.so.1.68.0"]} ) \ No newline at end of file diff --git a/tools/.env b/tools/.env index e84a918e..6c97484a 100644 --- a/tools/.env +++ b/tools/.env @@ -38,7 +38,7 @@ fi repository_name="openspacecollective" # image_version="$(echo ${version} | head -c 5)" -image_version="0.1.5" +image_version="0.1.6" image_name="${repository_name}/${project_name}:${image_version}" diff --git a/tools/development/docker/Dockerfile b/tools/development/docker/Dockerfile index b2d463b0..199c3843 100644 --- a/tools/development/docker/Dockerfile +++ b/tools/development/docker/Dockerfile @@ -7,7 +7,7 @@ ################################################################################################################################################################ -FROM openspacecollective/library-base:0.1.3 +FROM openspacecollective/library-base:0.1.4 LABEL maintainer="lucas@loftorbital.com"