Skip to content

Commit 76db40b

Browse files
Dan AlbertDanAlbert
authored andcommitted
CMake cleanup/modernization in hello-vulkan.
1 parent 84d452a commit 76db40b

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

hello-vulkan/app/src/main/cpp/CMakeLists.txt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,22 @@
1515
#]]
1616

1717
cmake_minimum_required(VERSION 4.1.0)
18-
project(hellovkjni)
18+
project(HelloVulkan LANGUAGES CXX)
1919

2020
include(AppLibrary)
21-
22-
# Include the GameActivity static lib to the project.
2321
find_package(game-activity REQUIRED CONFIG)
2422

25-
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
26-
27-
add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR=1)
23+
add_app_library(hellovkjni SHARED
24+
vk_main.cpp
25+
)
2826

29-
add_app_library(${PROJECT_NAME} SHARED
30-
vk_main.cpp)
27+
target_compile_definitions(hellovkjni PRIVATE
28+
VK_USE_PLATFORM_ANDROID_KHR=1
29+
)
3130

32-
# add lib dependencies
33-
target_link_libraries(${PROJECT_NAME} PUBLIC
31+
target_link_libraries(hellovkjni PUBLIC
3432
vulkan
3533
$<LINK_LIBRARY:WHOLE_ARCHIVE,game-activity::game-activity_static>
3634
android
37-
log)
35+
log
36+
)

0 commit comments

Comments
 (0)