Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.0.0 #103

Merged
merged 12 commits into from
May 3, 2024
36 changes: 0 additions & 36 deletions Builds/CMake/XBridgeWitnessNIH.cmake

This file was deleted.

51 changes: 0 additions & 51 deletions Builds/CMake/deps/Boost.cmake

This file was deleted.

36 changes: 0 additions & 36 deletions Builds/CMake/deps/FindRipple.cmake

This file was deleted.

15 changes: 9 additions & 6 deletions Builds/CMake/packaging/build_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ bin_dir="${src_dir}/build"
pkg_dir="${src_dir}/packages"
build_config=Release
conan_packages_to_build="missing"
#conan_profile="default"
nproc=$(($(nproc) - 2))

if [ $nproc -lt 3 ]; then
Expand All @@ -21,10 +20,14 @@ if [ $ID = centos ]; then
source /opt/rh/rh-python38/enable
conan_packages_to_build="" # blank bc all dependencies need to be built for CentOS 7 currently
#conan_profile="centos" # TODO: Make a "centos" profile and upload the bin pkgs
#conan remote add --insert 0 conan-non-prod http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod || true
fi

conan profile new default --detect
if ! (conan remote list | grep conan-non-prod); then
conan remote add --insert 0 conan-non-prod http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
fi
if ! (conan profile list | grep default); then
conan profile new default --detect;
fi
conan profile update settings.compiler.cppstd=20 default
conan profile update settings.compiler.libcxx=libstdc++11 default

Expand All @@ -39,7 +42,7 @@ cmake \
-B "${bin_dir}" \
-DCMAKE_BUILD_TYPE=${build_config} \
-DPKG=deb \
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=conan_toolchain.cmake \

cmake \
--build "${bin_dir}" \
Expand All @@ -51,8 +54,8 @@ cmake \
-S "${src_dir}" \
-B "${bin_dir}" \
-DCMAKE_BUILD_TYPE=${build_config} \
-DPKG=rpm \
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=conan_toolchain.cmake \
-DPKG=rpm

cmake \
--build "${bin_dir}" \
Expand Down
Loading
Loading