Skip to content

Commit cf82cee

Browse files
Merge pull request #814 from lukaszstolarczuk/fix-cmake-depr
Fix CMake warnings
2 parents 93fa68e + 25fbea7 commit cf82cee

File tree

6 files changed

+8
-36
lines changed

6 files changed

+8
-36
lines changed

CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,7 @@ else()
149149
GIT_TAG ${UMF_HWLOC_TAG}
150150
PATCH_COMMAND ${HWLOC_PATCH} SOURCE_SUBDIR contrib/windows-cmake/
151151
FIND_PACKAGE_ARGS)
152-
153-
FetchContent_GetProperties(hwloc_targ)
154-
if(NOT hwloc_targ_POPULATED)
155-
FetchContent_MakeAvailable(hwloc_targ)
156-
endif()
152+
FetchContent_MakeAvailable(hwloc_targ)
157153

158154
set(LIBHWLOC_INCLUDE_DIRS
159155
${hwloc_targ_SOURCE_DIR}/include;${hwloc_targ_BINARY_DIR}/include)
@@ -178,11 +174,7 @@ else()
178174
GIT_REPOSITORY ${UMF_HWLOC_REPO}
179175
GIT_TAG ${UMF_HWLOC_TAG}
180176
PATCH_COMMAND ${HWLOC_PATCH})
181-
182-
FetchContent_GetProperties(hwloc_targ)
183-
if(NOT hwloc_targ_POPULATED)
184-
FetchContent_MakeAvailable(hwloc_targ)
185-
endif()
177+
FetchContent_MakeAvailable(hwloc_targ)
186178

187179
add_custom_command(
188180
COMMAND ./autogen.sh

examples/cuda_shared_memory/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ FetchContent_Declare(
3535
GIT_REPOSITORY ${CUDA_REPO}
3636
GIT_TAG ${CUDA_TAG}
3737
EXCLUDE_FROM_ALL)
38-
39-
FetchContent_GetProperties(cuda-headers)
40-
if(NOT cuda-headers_POPULATED)
41-
FetchContent_Populate(cuda-headers)
42-
endif()
38+
FetchContent_MakeAvailable(cuda-headers)
4339

4440
set(CUDA_INCLUDE_DIRS
4541
${cuda-headers_SOURCE_DIR}

examples/ipc_level_zero/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ FetchContent_Declare(
3636
GIT_REPOSITORY ${LEVEL_ZERO_LOADER_REPO}
3737
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
3838
EXCLUDE_FROM_ALL)
39-
40-
FetchContent_GetProperties(level-zero-loader)
41-
if(NOT level-zero-loader_POPULATED)
42-
FetchContent_Populate(level-zero-loader)
43-
endif()
39+
FetchContent_MakeAvailable(level-zero-loader)
4440

4541
set(LEVEL_ZERO_INCLUDE_DIRS
4642
${level-zero-loader_SOURCE_DIR}/include

examples/level_zero_shared_memory/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ FetchContent_Declare(
3636
GIT_REPOSITORY ${LEVEL_ZERO_LOADER_REPO}
3737
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
3838
EXCLUDE_FROM_ALL)
39-
40-
FetchContent_GetProperties(level-zero-loader)
41-
if(NOT level-zero-loader_POPULATED)
42-
FetchContent_Populate(level-zero-loader)
43-
endif()
39+
FetchContent_MakeAvailable(level-zero-loader)
4440

4541
set(LEVEL_ZERO_INCLUDE_DIRS
4642
${level-zero-loader_SOURCE_DIR}/include

src/CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER AND (UMF_BUILD_GPU_TESTS
3232
GIT_REPOSITORY ${LEVEL_ZERO_LOADER_REPO}
3333
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
3434
EXCLUDE_FROM_ALL)
35-
36-
FetchContent_GetProperties(level-zero-loader)
37-
if(NOT level-zero-loader_POPULATED)
38-
FetchContent_Populate(level-zero-loader)
39-
endif()
35+
FetchContent_MakeAvailable(level-zero-loader)
4036

4137
set(LEVEL_ZERO_INCLUDE_DIRS
4238
${level-zero-loader_SOURCE_DIR}/include
@@ -62,11 +58,7 @@ if(UMF_BUILD_CUDA_PROVIDER)
6258
GIT_REPOSITORY ${CUDA_REPO}
6359
GIT_TAG ${CUDA_TAG}
6460
EXCLUDE_FROM_ALL)
65-
66-
FetchContent_GetProperties(cuda-headers)
67-
if(NOT cuda-headers_POPULATED)
68-
FetchContent_Populate(cuda-headers)
69-
endif()
61+
FetchContent_MakeAvailable(cuda-headers)
7062

7163
set(CUDA_INCLUDE_DIRS
7264
${cuda-headers_SOURCE_DIR}

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include(FetchContent)
99
FetchContent_Declare(
1010
googletest
1111
GIT_REPOSITORY https://github.com/google/googletest.git
12-
GIT_TAG release-1.12.1)
12+
GIT_TAG v1.15.2)
1313

1414
# For Windows: Prevent overriding the parent project's compiler/linker settings
1515
set(gtest_force_shared_crt

0 commit comments

Comments
 (0)