From c18787e0864fada4f5ae6b57cd04ee9c95d24f11 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Fri, 9 Jul 2021 02:41:36 -0700 Subject: [PATCH 1/8] [nuklear] Export unofficial target, add features. --- ports/nuklear/CMakeLists.txt | 31 +++++++++++++++++++++++++++++++ ports/nuklear/CONTROL | 4 ---- ports/nuklear/portfile.cmake | 24 ++++++++++++++++++++++-- ports/nuklear/vcpkg.json | 25 +++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 ports/nuklear/CMakeLists.txt delete mode 100644 ports/nuklear/CONTROL create mode 100644 ports/nuklear/vcpkg.json diff --git a/ports/nuklear/CMakeLists.txt b/ports/nuklear/CMakeLists.txt new file mode 100644 index 00000000000000..5ffeb40bb21527 --- /dev/null +++ b/ports/nuklear/CMakeLists.txt @@ -0,0 +1,31 @@ +cmake_minimum_required(VERSION 3.16) +project(Nuklear LANGUAGES C CXX) + +option(INSTALL_EXAMPLE "Install the example code" OFF) +option(INSTALL_DEMO "Install the demo code" OFF) + +add_library(nuklear INTERFACE) + +target_include_directories(nuklear INTERFACE $) +target_compile_definitions(nuklear INTERFACE NK_IMPLEMENTATION) + +# Installation +install( + TARGETS nuklear + EXPORT unofficial-nuklear + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES "${CMAKE_CURRENT_LIST_DIR}/src/nuklear.h" DESTINATION "include/nuklear") + +install(EXPORT unofficial-nuklear FILE unofficial-nuklear-config.cmake DESTINATION share/unofficial-nuklear) + +if (INSTALL_EXAMPLE) + install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/example" DESTINATION share/example) +endif() + +if (INSTALL_DEMO) + install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/demo" DESTINATION share/demo) +endif() diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL deleted file mode 100644 index 7b641a2a0676ac..00000000000000 --- a/ports/nuklear/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nuklear -Version: 2021-03-18 -Homepage: https://github.com/Immediate-Mode-UI/Nuklear -Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake index 53dd4c41910a9f..0881270581445b 100644 --- a/ports/nuklear/portfile.cmake +++ b/ports/nuklear/portfile.cmake @@ -5,6 +5,26 @@ vcpkg_from_github( SHA512 ce064dff721111749d4056717879f42d3e24bb94655dd2b04c137eb7391d2c90d0b1b95155912c100b537f74fd150aedc48e0ac85eb72963c66e35ac81048323 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/Readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/nuklear RENAME copyright) + +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + example INSTALL_EXAMPLE + demo INSTALL_DEMO +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nuklear) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/Readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/nuklear/vcpkg.json b/ports/nuklear/vcpkg.json new file mode 100644 index 00000000000000..1e48043bf8e890 --- /dev/null +++ b/ports/nuklear/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "nuklear", + "version-date": "2021-03-18", + "port-version": 1, + "description": "This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain", + "homepage": "https://github.com/Immediate-Mode-UI/Nuklear", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "demo": { + "description": "Install demo files" + }, + "example": { + "description": "Install example files" + } + } +} From f54b96ae0b60e264d7ccf6d60af1976145e05c8d Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Fri, 9 Jul 2021 02:42:13 -0700 Subject: [PATCH 2/8] update version stuff --- versions/baseline.json | 2 +- versions/n-/nuklear.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 61cd12944d1de3..d4438960c3fcab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4390,7 +4390,7 @@ }, "nuklear": { "baseline": "2021-03-18", - "port-version": 0 + "port-version": 1 }, "numactl": { "baseline": "2.0.12", diff --git a/versions/n-/nuklear.json b/versions/n-/nuklear.json index 82d95ffb8ad2e5..1264515be1d82b 100644 --- a/versions/n-/nuklear.json +++ b/versions/n-/nuklear.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f68acd72a4e21fa3c9f3395e579790eede7a382d", + "version-date": "2021-03-18", + "port-version": 1 + }, { "git-tree": "2a8abfe81ed0757650f10d7fd0e2ef8ecd484ae6", "version-string": "2021-03-18", From bcb1c2a0649f59f378c92cd44bc08922a5b3e401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 12 Jul 2021 11:07:44 +0800 Subject: [PATCH 3/8] Update ports/nuklear/portfile.cmake --- ports/nuklear/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake index 0881270581445b..e13332986b517e 100644 --- a/ports/nuklear/portfile.cmake +++ b/ports/nuklear/portfile.cmake @@ -16,7 +16,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ) @@ -27,4 +26,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nuklear) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/Readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/Readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From d6393939e52f1979095ce1bf68aaa25ce95e54b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 12 Jul 2021 14:10:10 +0800 Subject: [PATCH 4/8] Update versions/n-/nuklear.json --- versions/n-/nuklear.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/n-/nuklear.json b/versions/n-/nuklear.json index 1264515be1d82b..f43b53400506ab 100644 --- a/versions/n-/nuklear.json +++ b/versions/n-/nuklear.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f68acd72a4e21fa3c9f3395e579790eede7a382d", + "git-tree": "868bfa99f7aeda30fbb2cab19fe6e81962858274", "version-date": "2021-03-18", "port-version": 1 }, From 92351844fe1827f9543ae730155e4df249e0d891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:44:51 +0800 Subject: [PATCH 5/8] Update ports/nuklear/CMakeLists.txt --- ports/nuklear/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/nuklear/CMakeLists.txt b/ports/nuklear/CMakeLists.txt index 5ffeb40bb21527..19f3e8ecf50130 100644 --- a/ports/nuklear/CMakeLists.txt +++ b/ports/nuklear/CMakeLists.txt @@ -27,5 +27,6 @@ if (INSTALL_EXAMPLE) endif() if (INSTALL_DEMO) - install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/demo" DESTINATION share/demo) + install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/demo" DESTINATION share/nuklear) + endif() From 32691c6e7e7760d8ef1e51b8b5ea8748606e1f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:44:55 +0800 Subject: [PATCH 6/8] Update ports/nuklear/CMakeLists.txt --- ports/nuklear/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/nuklear/CMakeLists.txt b/ports/nuklear/CMakeLists.txt index 19f3e8ecf50130..2d3e6cc98a86f5 100644 --- a/ports/nuklear/CMakeLists.txt +++ b/ports/nuklear/CMakeLists.txt @@ -18,7 +18,8 @@ install( ARCHIVE DESTINATION lib ) -install(FILES "${CMAKE_CURRENT_LIST_DIR}/src/nuklear.h" DESTINATION "include/nuklear") +install(FILES "${CMAKE_CURRENT_LIST_DIR}/nuklear.h" DESTINATION "include/nuklear") + install(EXPORT unofficial-nuklear FILE unofficial-nuklear-config.cmake DESTINATION share/unofficial-nuklear) From cc1e3f9d183cfb85f8d18e2678cceeaac2ac32c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:44:59 +0800 Subject: [PATCH 7/8] Update ports/nuklear/CMakeLists.txt --- ports/nuklear/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/nuklear/CMakeLists.txt b/ports/nuklear/CMakeLists.txt index 2d3e6cc98a86f5..28009f466b754b 100644 --- a/ports/nuklear/CMakeLists.txt +++ b/ports/nuklear/CMakeLists.txt @@ -24,7 +24,8 @@ install(FILES "${CMAKE_CURRENT_LIST_DIR}/nuklear.h" DESTINATION "include/nuklear install(EXPORT unofficial-nuklear FILE unofficial-nuklear-config.cmake DESTINATION share/unofficial-nuklear) if (INSTALL_EXAMPLE) - install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/example" DESTINATION share/example) + install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/example" DESTINATION share/nuklear) + endif() if (INSTALL_DEMO) From 14206f0359427ef1ea2d00e5ebf2f46f0a909e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:53:57 +0800 Subject: [PATCH 8/8] Update versions/n-/nuklear.json --- versions/n-/nuklear.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/n-/nuklear.json b/versions/n-/nuklear.json index f43b53400506ab..195260366136e2 100644 --- a/versions/n-/nuklear.json +++ b/versions/n-/nuklear.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "868bfa99f7aeda30fbb2cab19fe6e81962858274", + "git-tree": "9c243e51fbb0d9fa4562a3e4a8eba9a7fb2e0cdd", "version-date": "2021-03-18", "port-version": 1 },