update cmake config

CMakeIncludes/packaging.cmake

@@ -16,4 +16,8 @@ else()
     set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
     set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
 endif()
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4-openssl-dev")
+set(CPACK_RPM_PACKAGE_REQUIRES "libcurl-devel")
+
 include(CPack)
\ No newline at end of file

consumer/api/cpp/CMakeLists.txt

@@ -31,7 +31,7 @@ if (BUILD_STATIC_CLIENT_LIBS)
     target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../c/include>)
     target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ASAPO_CXX_COMMON_INCLUDE_DIR}>)
     target_include_directories(${TARGET_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
-    target_link_libraries(${TARGET_NAME} CURL::libcurl ${CMAKE_THREAD_LIBS_INIT} ${ASAPO_COMMON_FABRIC_LIBRARIES})
+    target_link_libraries(${TARGET_NAME} INTERFACE CURL::libcurl ${CMAKE_THREAD_LIBS_INIT} ${ASAPO_COMMON_FABRIC_LIBRARIES})
     #install
     install(TARGETS  ${TARGET_NAME} EXPORT AsapoConsumerStaticTarget
             LIBRARY DESTINATION lib

deploy/build_env/centos/Dockerfile.7.9.2009

@@ -17,7 +17,7 @@ RUN yum -y install autoconf libtool libibverbs librdmacm librdmacm-devel
 ADD install_libfabric.sh install_libfabric.sh
 RUN ./install_libfabric.sh
 
-RUN yum -y install mc
+RUN yum -y install mc libcurl-devel
 
 ENV GOPATH /tmp
 ENV OS el7

deploy/build_env/centos/Dockerfile.8.3.2011

@@ -14,6 +14,8 @@ RUN ./install_curl.sh /curl
 ADD install_libfabric.sh install_libfabric.sh
 RUN ./install_libfabric.sh
 
+RUN yum -y install mc libcurl-devel
+
 ENV GOPATH /tmp
 ENV OS el8
 ADD build.sh /bin/build.sh

deploy/build_env/centos/build.sh

@@ -8,13 +8,23 @@ cmake \
     -DBUILD_CLIENTS_ONLY=ON \
     -DPACKAGE_RELEASE_SUFFIX=1.$OS \
     -DBUILD_PYTHON=OFF   \
-    -DLIBCURL_DIR=/curl \
     -DCPACK_PACKAGE_NAME="asapo-devel" \
     -DCPACK_GENERATOR="RPM" \
     ..
 make -j 4
 make package
 
-cmake -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DBUILD_PYTHON_PACKAGES="source;rpm" ..
-make
+#switch to static curl for Python packages
+rm CMakeCache.txt
+cmake \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DLIBCURL_DIR=/curl  \
+    -DENABLE_LIBFABRIC=ON \
+    -DBUILD_CLIENTS_ONLY=ON \
+    -DNUMPY_VERSION=0   \
+    -DBUILD_PYTHON=ON   \
+    -DBUILD_PYTHON_PACKAGES="source;rpm"   \
+    -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS \
+    ..
+make -j 1
 

deploy/build_env/debians/Dockerfile_debian10.7

@@ -15,6 +15,8 @@ RUN ./install_curl.sh /curl &&  ./install_cmake.sh
 ADD install_libfabric.sh install_libfabric.sh
 RUN ./install_libfabric.sh
 
+RUN apt install -y libcurl4-openssl-dev
+
 ARG OS
 ENV OS=${OS}
 ADD build.sh /bin/build.sh
\ No newline at end of file

deploy/build_env/debians/Dockerfile_debian9.13

@@ -15,6 +15,8 @@ RUN ./install_curl.sh /curl &&  ./install_cmake.sh
 ADD install_libfabric.sh install_libfabric.sh
 RUN ./install_libfabric.sh
 
+RUN apt install -y libcurl4-openssl-dev
+
 ARG OS
 ENV OS=${OS}
 ADD build.sh /bin/build.sh
\ No newline at end of file

deploy/build_env/debians/Dockerfile_ubuntu16.04

@@ -8,13 +8,15 @@ ADD install_cmake.sh install_cmake.sh
 RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
 zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
 
-RUN pip  --no-cache-dir install cython && pip3 --no-cache-dir install cython sphinx
+RUN pip  --no-cache-dir install cython && pip3 --no-cache-dir install cython
 
 RUN ./install_curl.sh /curl &&  ./install_cmake.sh
 
 ADD install_libfabric.sh install_libfabric.sh
 RUN ./install_libfabric.sh
 
+RUN apt install -y libcurl4-openssl-dev
+
 ARG OS
 ENV OS=${OS}
 ADD build.sh /bin/build.sh
\ No newline at end of file

deploy/build_env/debians/Dockerfile_ubuntu18.04

@@ -8,13 +8,15 @@ ADD install_cmake.sh install_cmake.sh
 RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
 zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
 
-RUN pip  --no-cache-dir install cython && pip3 --no-cache-dir install cython
+RUN pip  --no-cache-dir install cython && pip3 --no-cache-dir install cython sphinx
 
 RUN ./install_curl.sh /curl &&  ./install_cmake.sh
 
 ADD install_libfabric.sh install_libfabric.sh
 RUN ./install_libfabric.sh
 
+RUN apt install -y libcurl4-openssl-dev
+
 ARG OS
 ENV OS=${OS}
 ADD build.sh /bin/build.sh
\ No newline at end of file

deploy/build_env/debians/build.sh

@@ -10,7 +10,6 @@ cmake \
     -DBUILD_CLIENTS_ONLY=ON \
     -DPACKAGE_RELEASE_SUFFIX=$OS \
     -DBUILD_PYTHON=OFF   \
-    -DLIBCURL_DIR=/curl \
     -DCPACK_PACKAGE_NAME="asapo-dev" \
     -DCPACK_GENERATOR="DEB" \
     ..
@@ -19,12 +18,22 @@ make -j 4
 make package
 
 
-if [ "$OS" = "ubuntu16.04" ]; then
+if [ "$OS" = "ubuntu18.04" ]; then
   BUILD_PYTHON_DOCS=ON
 else
   BUILD_PYTHON_DOCS=OFF
 fi
 
-
-cmake -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DBUILD_PYTHON_PACKAGES="source;deb" -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS ..
-make -j1
+#switch to static curl for Python packages
+rm CMakeCache.txt
+cmake \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DLIBCURL_DIR=/curl  \
+    -DENABLE_LIBFABRIC=ON \
+    -DBUILD_CLIENTS_ONLY=ON \
+    -DNUMPY_VERSION=0   \
+    -DBUILD_PYTHON=ON   \
+    -DBUILD_PYTHON_PACKAGES="source;deb"   \
+    -DBUILD_PYTHON_DOCS=$BUILD_PYTHON_DOCS \
+    ..
+make -j 1

deploy/build_env/debians/build_images.sh

 #!/usr/bin/env bash
 set -e
 
-vers="ubuntu16.04 ubuntu18.04 debian9.13 debian10.7"
+vers="ubuntu18.04 ubuntu16.04 debian9.13 debian10.7"
 
 for ver in $vers
 do

install/cmake/AsapoConfig.cmake

@@ -91,7 +91,7 @@ endmacro()
 
 if( "S${Asapo_FIND_COMPONENTS}" STREQUAL "S")
     foreach(_comp ${_supported_components})
-        include("${CMAKE_CURRENT_LIST_DIR}/Asapo${_comp}StaticTarget.cmake")
+        asapo_load_comp_targets(${_comp} ${static} ${shared})
     endforeach()
 else()
     foreach(_comp ${Asapo_FIND_COMPONENTS})