Skip to content

Commit d3dc6c1

Browse files
committed
remove deprecated FetchContent_Populate
1 parent 019c374 commit d3dc6c1

File tree

1 file changed

+24
-34
lines changed

1 file changed

+24
-34
lines changed

cmake/Dependencies.cmake

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -115,42 +115,32 @@ set(JSON_ImplicitConversions OFF)
115115
# For Windows: Prevent overriding the parent project's compiler/linker settings
116116
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
117117

118-
FetchContent_MakeAvailable(sdl2 sdl2_image sdl2_ttf sdl2_mixer spdlog glm googletest nlohmann_json)
119-
120118
add_compile_definitions(GLEW_NO_GLU)
121119

122-
FetchContent_GetProperties(glew)
123-
if (NOT ${glew_POPULATED})
124-
FetchContent_Populate(glew)
125-
add_subdirectory(${glew_SOURCE_DIR} ${glew_BINARY_DIR} EXCLUDE_FROM_ALL)
126-
endif()
127-
128-
FetchContent_GetProperties(imgui)
129-
if (NOT ${imgui_POPULATED})
130-
FetchContent_Populate(imgui)
131-
set(IMGUI_SOURCE
132-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/backends/imgui_impl_sdl2.cpp
133-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/backends/imgui_impl_opengl3.cpp
134-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui.cpp
135-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui_demo.cpp
136-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui_draw.cpp
137-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui_tables.cpp
138-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui_widgets.cpp
139-
)
140-
141-
set(IMGUI_INCLUDE_DIR
142-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/
143-
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/backends/
144-
${CMAKE_CURRENT_SOURCE_DIR}/lib/sdl2/include/
145-
)
146-
147-
add_library(ImGui STATIC
148-
${IMGUI_SOURCE}
149-
)
150-
target_include_directories(ImGui PUBLIC
151-
${IMGUI_INCLUDE_DIR}
152-
)
153-
endif()
120+
FetchContent_MakeAvailable(glew sdl2 sdl2_image sdl2_ttf sdl2_mixer spdlog glm googletest imgui nlohmann_json)
121+
122+
set(IMGUI_SOURCE
123+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/backends/imgui_impl_sdl2.cpp
124+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/backends/imgui_impl_opengl3.cpp
125+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui.cpp
126+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui_demo.cpp
127+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui_draw.cpp
128+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui_tables.cpp
129+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/imgui_widgets.cpp
130+
)
131+
132+
set(IMGUI_INCLUDE_DIR
133+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/
134+
${CMAKE_CURRENT_SOURCE_DIR}/lib/imgui/backends/
135+
${CMAKE_CURRENT_SOURCE_DIR}/lib/sdl2/include/
136+
)
137+
138+
add_library(ImGui STATIC
139+
${IMGUI_SOURCE}
140+
)
141+
target_include_directories(ImGui PUBLIC
142+
${IMGUI_INCLUDE_DIR}
143+
)
154144

155145

156146
set(DEPENDENCY_LINK_LIBRARIES

0 commit comments

Comments
 (0)