Skip to content

Commit 2fbf85c

Browse files
try to fix build.
1 parent f2213de commit 2fbf85c

3 files changed

Lines changed: 18 additions & 3 deletions

File tree

ci/scripts/build_example.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,22 @@ is_windows() {
2929
[[ "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]
3030
}
3131

32+
iceberg_prefix="${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}}"
33+
if is_windows; then
34+
iceberg_prefix_cmake="$(cygpath -m "${iceberg_prefix}")"
35+
else
36+
iceberg_prefix_cmake="${iceberg_prefix}"
37+
fi
38+
3239
CMAKE_ARGS=(
3340
"-G Ninja"
34-
"-DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}}"
41+
"-DCMAKE_PREFIX_PATH=${iceberg_prefix_cmake}"
3542
)
3643

3744
if is_windows; then
3845
CMAKE_ARGS+=("-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake")
3946
CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release")
47+
CMAKE_ARGS+=("-Diceberg_DIR=${iceberg_prefix_cmake}/lib/cmake/iceberg")
4048
else
4149
CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Debug")
4250
fi

ci/scripts/build_iceberg.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,16 @@ is_windows() {
3131
[[ "${OSTYPE}" == "msys" || "${OSTYPE}" == "win32" ]]
3232
}
3333

34+
iceberg_prefix="${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}}"
35+
if is_windows; then
36+
iceberg_prefix_cmake="$(cygpath -m "${iceberg_prefix}")"
37+
else
38+
iceberg_prefix_cmake="${iceberg_prefix}"
39+
fi
40+
3441
CMAKE_ARGS=(
3542
"-G Ninja"
36-
"-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ICEBERG_HOME}}"
43+
"-DCMAKE_INSTALL_PREFIX=${iceberg_prefix_cmake}"
3744
"-DICEBERG_BUILD_STATIC=ON"
3845
"-DICEBERG_BUILD_SHARED=ON"
3946
"-DICEBERG_BUILD_REST_INTEGRATION_TESTS=${build_rest_integration_test}"

cmake_modules/IcebergBuildUtils.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function(iceberg_install_cmake_package PACKAGE_NAME EXPORT_NAME)
2626
configure_package_config_file("${CONFIG_CMAKE}.in" "${BUILT_CONFIG_CMAKE}"
2727
INSTALL_DESTINATION "${ICEBERG_INSTALL_CMAKEDIR}/${PACKAGE_NAME}"
2828
)
29-
set(CONFIG_VERSION_CMAKE "${PACKAGE_NAME}config-version.cmake")
29+
set(CONFIG_VERSION_CMAKE "${PACKAGE_NAME}-config-version.cmake")
3030
set(BUILT_CONFIG_VERSION_CMAKE "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_VERSION_CMAKE}")
3131
write_basic_package_version_file("${BUILT_CONFIG_VERSION_CMAKE}"
3232
COMPATIBILITY SameMajorVersion)

0 commit comments

Comments
 (0)