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.

Sign up for GitHub

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

Jump to bottom

[ci] Require CMake 3.28 and replace FetchContent_Populate with FetchContent_MakeAvailable #6550

Merged
merged 24 commits into from
Aug 2, 2024
Merged

[ci] Require CMake 3.28 and replace FetchContent_Populate with FetchContent_MakeAvailable #6550

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6d0ad77
Replace `FetchContent_Populate` with `FetchContent_MakeAvailable`
StrikerRUS Jul 16, 2024
629a816
Test with VS 2022
StrikerRUS Jul 16, 2024
53cbe48
Update IntegratedOpenCL.cmake
StrikerRUS Jul 16, 2024
e923d77
Update IntegratedOpenCL.cmake
StrikerRUS Jul 16, 2024
c97def0
Update IntegratedOpenCL.cmake
StrikerRUS Jul 16, 2024
70df6df
Update IntegratedOpenCL.cmake
StrikerRUS Jul 16, 2024
72324f2
Update IntegratedOpenCL.cmake
StrikerRUS Jul 17, 2024
a8616c5
Update .vsts-ci.yml
StrikerRUS Jul 17, 2024
639db60
bump minimum CMake version
StrikerRUS Jul 17, 2024
03af08d
force symlinking
StrikerRUS Jul 17, 2024
b8c2b9d
fix line length
StrikerRUS Jul 17, 2024
151b8e9
install curl
StrikerRUS Jul 17, 2024
f383a93
install sudo
StrikerRUS Jul 17, 2024
64a528a
install certs
StrikerRUS Jul 17, 2024
571a7be
install CMake for R Windows jobs
StrikerRUS Jul 17, 2024
1fe7190
debug cmake
StrikerRUS Jul 17, 2024
be48602
new try
StrikerRUS Jul 17, 2024
93d561f
remove CMake from RTools
StrikerRUS Jul 17, 2024
97c8561
cleanup
StrikerRUS Jul 17, 2024
622e39c
Merge branch 'master' into ci/opencl
StrikerRUS Jul 24, 2024
fa116f0
remove duplicted curl installation
StrikerRUS Jul 24, 2024
f0bb3a1
Merge branch 'master' into ci/opencl
StrikerRUS Jul 30, 2024
dd7601d
Merge branch 'master' into ci/opencl
StrikerRUS Jul 31, 2024
98b853e
CMake version as variable
StrikerRUS Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ jobs:
- job: Windows
###########################################
pool:
vmImage: 'windows-2019'
vmImage: 'windows-2022'
strategy:
matrix:
regular:
Expand Down
9 changes: 5 additions & 4 deletions cmake/IntegratedOpenCL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include(FetchContent)
FetchContent_Declare(OpenCL-Headers GIT_REPOSITORY ${OPENCL_HEADER_REPOSITORY} GIT_TAG ${OPENCL_HEADER_TAG})
FetchContent_GetProperties(OpenCL-Headers)
if(NOT OpenCL-Headers_POPULATED)
FetchContent_Populate(OpenCL-Headers)
FetchContent_MakeAvailable(OpenCL-Headers)
message(STATUS "Populated OpenCL Headers")
endif()
set(OPENCL_ICD_LOADER_HEADERS_DIR ${opencl-headers_SOURCE_DIR} CACHE PATH "") # for OpenCL ICD Loader
Expand All @@ -25,11 +25,10 @@ set(OpenCL_INCLUDE_DIR ${opencl-headers_SOURCE_DIR} CACHE PATH "") # for Boost::
FetchContent_Declare(OpenCL-ICD-Loader GIT_REPOSITORY ${OPENCL_LOADER_REPOSITORY} GIT_TAG ${OPENCL_LOADER_TAG})
FetchContent_GetProperties(OpenCL-ICD-Loader)
if(NOT OpenCL-ICD-Loader_POPULATED)
FetchContent_Populate(OpenCL-ICD-Loader)
FetchContent_MakeAvailable(OpenCL-ICD-Loader)
if(WIN32)
set(USE_DYNAMIC_VCXX_RUNTIME ON)
endif()
add_subdirectory(${opencl-icd-loader_SOURCE_DIR} ${opencl-icd-loader_BINARY_DIR} EXCLUDE_FROM_ALL)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment, FetchContent_MakeAvailable performs add_subdirectory() on a CMake-using project's root.
https://gitlab.kitware.com/cmake/cmake/-/issues/22904

https://github.com/pupnp/pupnp/blob/a797db77abce24f8b4d231785b3b53fd3571fb52/cmake/CmDaB.cmake#L48-L58

https://github.com/wiredtiger/wiredtiger/blob/ae9445d14c33c245d0d6eead556cc360fdd60851/CMakeLists.txt#L120-L133

message(STATUS "Populated OpenCL ICD Loader")
endif()
list(APPEND INTEGRATED_OPENCL_INCLUDES ${OPENCL_ICD_LOADER_HEADERS_DIR})
Expand Down Expand Up @@ -60,8 +59,10 @@ set(BOOST_INCLUDE "${BOOST_BASE}/source" CACHE PATH "")
set(BOOST_LIBRARY "${BOOST_BASE}/source/stage/lib" CACHE PATH "")
if(WIN32)
if(MSVC)
if(${MSVC_VERSION} GREATER 1929)
if(${MSVC_VERSION} GREATER 1949)
message(FATAL_ERROR "Unrecognized MSVC version number: ${MSVC_VERSION}")
elseif(${MSVC_VERSION} GREATER 1929)
set(MSVC_TOOLCHAIN_ID "v143")
elseif(${MSVC_VERSION} GREATER 1919)
set(MSVC_TOOLCHAIN_ID "142")
elseif(${MSVC_VERSION} GREATER 1909)
Expand Down
Loading