From 6d63b6cf2daad1a23e17dc8c7d525a041cb4ab44 Mon Sep 17 00:00:00 2001 From: James Benton Date: Wed, 20 Nov 2019 12:45:17 +0000 Subject: [PATCH] cmake: Cleanup cmake based samples. --- samples/cmake/custom_default_heap/CMakeLists.txt | 12 ++---------- samples/cmake/gx2_triangle/CMakeLists.txt | 8 -------- samples/cmake/helloworld/CMakeLists.txt | 6 ------ samples/cmake/helloworld_cpp/CMakeLists.txt | 7 ------- samples/cmake/my_first_rpl/CMakeLists.txt | 7 ++----- samples/cmake/swkbd/CMakeLists.txt | 14 +------------- 6 files changed, 5 insertions(+), 49 deletions(-) diff --git a/samples/cmake/custom_default_heap/CMakeLists.txt b/samples/cmake/custom_default_heap/CMakeLists.txt index bf1f6bd8..be747824 100644 --- a/samples/cmake/custom_default_heap/CMakeLists.txt +++ b/samples/cmake/custom_default_heap/CMakeLists.txt @@ -5,16 +5,8 @@ include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(custom_default_heap main.c) -target_link_libraries(custom_default_heap - whb - proc_ui - sysapp) - -wut_add_exports(custom_default_heap - exports.def) - -wut_create_rpx(custom_default_heap.rpx - custom_default_heap) +wut_add_exports(custom_default_heap exports.def) +wut_create_rpx(custom_default_heap.rpx custom_default_heap) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/custom_default_heap.rpx" DESTINATION "${CMAKE_INSTALL_PREFIX}") diff --git a/samples/cmake/gx2_triangle/CMakeLists.txt b/samples/cmake/gx2_triangle/CMakeLists.txt index fcd4114a..1722b95a 100644 --- a/samples/cmake/gx2_triangle/CMakeLists.txt +++ b/samples/cmake/gx2_triangle/CMakeLists.txt @@ -5,14 +5,6 @@ include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(gx2_triangle main.c) -target_link_libraries(gx2_triangle - whb - gfd - gx2 - proc_ui - nsysnet - sysapp) - wut_create_rpx(gx2_triangle.rpx gx2_triangle) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gx2_triangle.rpx" diff --git a/samples/cmake/helloworld/CMakeLists.txt b/samples/cmake/helloworld/CMakeLists.txt index e5a5d203..e8a9105d 100644 --- a/samples/cmake/helloworld/CMakeLists.txt +++ b/samples/cmake/helloworld/CMakeLists.txt @@ -5,12 +5,6 @@ include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(helloworld main.c) -target_link_libraries(helloworld - whb - coreinit - proc_ui - sysapp) - wut_create_rpx(helloworld.rpx helloworld) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/helloworld.rpx" diff --git a/samples/cmake/helloworld_cpp/CMakeLists.txt b/samples/cmake/helloworld_cpp/CMakeLists.txt index 62adce35..12e385a1 100644 --- a/samples/cmake/helloworld_cpp/CMakeLists.txt +++ b/samples/cmake/helloworld_cpp/CMakeLists.txt @@ -5,13 +5,6 @@ include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(helloworld_cpp main.cpp) -target_link_libraries(helloworld_cpp - whb - coreinit - proc_ui - sysapp - nn_ac) - wut_create_rpx(helloworld_cpp.rpx helloworld_cpp) diff --git a/samples/cmake/my_first_rpl/CMakeLists.txt b/samples/cmake/my_first_rpl/CMakeLists.txt index afcebab9..3e567049 100644 --- a/samples/cmake/my_first_rpl/CMakeLists.txt +++ b/samples/cmake/my_first_rpl/CMakeLists.txt @@ -5,11 +5,8 @@ include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(my_first_rpl my_first_rpl.c) -wut_add_exports(my_first_rpl - exports.def) - -wut_create_rpl(my_first_rpl.rpl - my_first_rpl) +wut_add_exports(my_first_rpl exports.def) +wut_create_rpl(my_first_rpl.rpl my_first_rpl) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/my_first_rpl.rpl" DESTINATION "${CMAKE_INSTALL_PREFIX}") diff --git a/samples/cmake/swkbd/CMakeLists.txt b/samples/cmake/swkbd/CMakeLists.txt index 198948eb..2629d633 100644 --- a/samples/cmake/swkbd/CMakeLists.txt +++ b/samples/cmake/swkbd/CMakeLists.txt @@ -5,19 +5,7 @@ include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(swkbd main.cpp) -target_link_libraries(swkbd - whb - gx2 - coreinit - proc_ui - sysapp - nsysnet - nn_ac - nn_swkbd - vpad) - -wut_create_rpx(swkbd_sample.rpx - swkbd) +wut_create_rpx(swkbd_sample.rpx swkbd) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/swkbd_sample.rpx" DESTINATION "${CMAKE_INSTALL_PREFIX}")