Skip to content

Commit 22e2159

Browse files
committed
Update CMakeLists.txt and pyproject.toml for vcpkg path corrections and manylinux image version
1 parent 5ff6443 commit 22e2159

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if (${PLATFORM} STREQUAL "WINDOWS")
5858
set_target_properties(opengl32 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/pre-built/windows/libx64/OpenGL32.Lib)
5959

6060
set(LIB_DIR
61-
${CMAKE_SOURCE_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}-windows-static/lib
61+
${CMAKE_SOURCE_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/lib
6262
${CMAKE_SOURCE_DIR}/pre-built/windows/libx64
6363
)
6464
set(ALL_COMPILER_ARGS
@@ -67,7 +67,7 @@ if (${PLATFORM} STREQUAL "WINDOWS")
6767
/std:c++17
6868
)
6969
set (OS_SPECIFIC_INCLUDES
70-
vcpkg_installed/${VCPKG_TARGET_TRIPLET}-windows-static/include
70+
vcpkg_installed/${VCPKG_TARGET_TRIPLET}/include
7171
)
7272
set (OS_SPECIFIC_LIBRARY_NAMES
7373
Advapi32 Ws2_32 glew32 freetype libpng16 libxml2 opengl32 netCDF::netcdf

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,5 @@ VCPKG_ROOT = "{project}/vendor/vcpkg"
7777

7878
[tool.cibuildwheel.linux]
7979
before-all = "yum install -y perl perl-IPC-Cmd zip"
80+
#manylinux-x86_64-image = "manylinux2014"
81+
manylinux-x86_64-image = "manylinux_2_28"

0 commit comments

Comments
 (0)