Merge pull request #304 from pmienk/master

Alter installation to provide BOOST_ROOT environment variable assignment.
libbitcoin · Oct 5, 2023 · b1925f3 · b1925f3
2 parents 8b3e7d8 + a3f4849
commit b1925f3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/templates/gsl.ci.yml b/templates/gsl.ci.yml
@@ -641,6 +641,12 @@ endfunction # get_sln_tests
 .   define my.config = emit_step_display_environment.configuration
 .   define my.repository = emit_step_display_environment.repository
 .
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -711,12 +717,12 @@ endfunction # get_sln_tests
       - name: Execute install$(my.suffix)
         run: >
           ./install$(my.suffix)
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
 .   if (defined(my.config.use_preset))
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix/${{ matrix.preset }}
           --preset=${{ matrix.preset }}
 .   else
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
 .   endif
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}

diff --git a/templates/gsl.install-cmake.sh b/templates/gsl.install-cmake.sh
@@ -243,7 +243,7 @@ cmake_project_directory()
     local PROJ_CONFIG_DIR
     PROJ_CONFIG_DIR=\$(pwd)
 
-    cmake $@ builds/cmake
+    cmake -LA $@ builds/cmake
     make_jobs "$JOBS"
 
     if [[ $TEST == true ]]; then

diff --git a/templates/gsl.install-cmakepresets.sh b/templates/gsl.install-cmakepresets.sh
@@ -341,7 +341,7 @@ cmake_project_directory()
 
     push_directory "builds/cmake"
     display_message "Preparing cmake --preset=$PRESET $@"
-    cmake --preset=$PRESET $@
+    cmake -LA --preset=$PRESET $@
     popd
 
     push_directory "obj/$PRESET"

diff --git a/templates/shared/common_install_shell_artifacts.gsl b/templates/shared/common_install_shell_artifacts.gsl
@@ -296,6 +296,7 @@ display_configuration()
 .   if (have_build(my.install, "boost"))
     display_message "BUILD_BOOST           : $BUILD_BOOST"
 .   endif
+    display_message "BOOST_ROOT            : $BOOST_ROOT"
 .   custom_configuration(my.repository, my.install)
     display_message "PREFIX                : $PREFIX"
     display_message "DISABLE_SHARED        : $DISABLE_SHARED"
@@ -585,19 +586,19 @@ set_pkgconfigdir()
 set_with_boost_prefix()
 {
     if [[ $BUILD_BOOST ]]; then
+.   if defined(my.configuration.cmake)
+        # Boost detection via FindBoost.cmake provides for path hint via
+	# $BOOT_ROOT environment variable only.
+.   else
         # Boost has no pkg-config, m4 searches in the following order:
         # --with-boost=<path>, /usr, /usr/local, /opt, /opt/local, $BOOST_ROOT.
         # We use --with-boost to prioritize the --prefix path when we build it.
         # Otherwise standard paths suffice for Linux, Homebrew and MacPorts.
         # ax_boost_base.m4 appends /include and adds to BOOST_CPPFLAGS
         # ax_boost_base.m4 searches for /lib /lib64 and adds to BOOST_LDFLAGS
-.   if defined(my.configuration.cmake)
-        #
-        # cmake does not process this argument, so it has been zeroed out.
-        with_boost=""
-.   else
         with_boost="--with-boost=$PREFIX"
 .   endif
+        export BOOST_ROOT="$PREFIX"
     fi
 }