From 8e8c19b47b5b810e21c99dedd5f272f1cd06beaf Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Sun, 23 Jun 2019 19:26:28 -0700 Subject: [PATCH 1/3] [wintoast] Add new port. --- ports/wintoast/CONTROL | 3 +++ ports/wintoast/portfile.cmake | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 ports/wintoast/CONTROL create mode 100644 ports/wintoast/portfile.cmake diff --git a/ports/wintoast/CONTROL b/ports/wintoast/CONTROL new file mode 100644 index 00000000000000..d9d410796d7696 --- /dev/null +++ b/ports/wintoast/CONTROL @@ -0,0 +1,3 @@ +Source: wintoast +Version: 1.2.0 +Description: WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10. \ No newline at end of file diff --git a/ports/wintoast/portfile.cmake b/ports/wintoast/portfile.cmake new file mode 100644 index 00000000000000..6ddb2dec716ffa --- /dev/null +++ b/ports/wintoast/portfile.cmake @@ -0,0 +1,17 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mohabouje/WinToast + REF v1.2.0 + SHA512 d8bd44439100772929eb8a4eb4aebfd66fa54562c838eb4c081a382dc1d73c545faa6d9675e320864d9b533e4a0c4a673e44058c7f643ccd56ec90830cdfaf45 + HEAD_REF master +) + +# Install source files +file(INSTALL ${SOURCE_PATH}/src/wintoastlib.cpp + ${SOURCE_PATH}/src/wintoastlib.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + +# Install license +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From ed253f566d5cec35969b33001649019d5b9b1f6b Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Mon, 24 Jun 2019 23:11:19 -0700 Subject: [PATCH 2/3] Add CMakeLists.txt. --- ports/wintoast/CMakeLists.txt | 20 ++++++++++++++++++++ ports/wintoast/portfile.cmake | 20 ++++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 ports/wintoast/CMakeLists.txt diff --git a/ports/wintoast/CMakeLists.txt b/ports/wintoast/CMakeLists.txt new file mode 100644 index 00000000000000..2dcd5bcb42e56f --- /dev/null +++ b/ports/wintoast/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.11) +project(wintoast) + +set(HEADER_FILES +src/wintoastlib.h +) + +set(SRC_FILES +src/wintoastlib.cpp +) + +add_library(wintoast ${SRC_FILES} ${HEADER_FILES}) + +install(TARGETS wintoast + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES ${HEADER_FILES} DESTINATION include/wintoast) diff --git a/ports/wintoast/portfile.cmake b/ports/wintoast/portfile.cmake index 6ddb2dec716ffa..2676befd0b46b2 100644 --- a/ports/wintoast/portfile.cmake +++ b/ports/wintoast/portfile.cmake @@ -1,5 +1,11 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mohabouje/WinToast @@ -8,10 +14,16 @@ vcpkg_from_github( HEAD_REF master ) -# Install source files -file(INSTALL ${SOURCE_PATH}/src/wintoastlib.cpp - ${SOURCE_PATH}/src/wintoastlib.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Install license file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 058a939cdf4f514f40225c6b200d5f0dc62359af Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Wed, 3 Jul 2019 01:06:51 -0700 Subject: [PATCH 3/3] Change the way to install headers. --- ports/wintoast/CMakeLists.txt | 17 +++++++++++------ ports/wintoast/portfile.cmake | 3 +++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ports/wintoast/CMakeLists.txt b/ports/wintoast/CMakeLists.txt index 2dcd5bcb42e56f..eb70fb9cfb4fe5 100644 --- a/ports/wintoast/CMakeLists.txt +++ b/ports/wintoast/CMakeLists.txt @@ -1,20 +1,25 @@ cmake_minimum_required(VERSION 3.11) project(wintoast) -set(HEADER_FILES -src/wintoastlib.h -) - set(SRC_FILES src/wintoastlib.cpp ) -add_library(wintoast ${SRC_FILES} ${HEADER_FILES}) +add_library(wintoast ${SRC_FILES}) + +target_include_directories(wintoast PUBLIC + $ + $ +) +# Install targets install(TARGETS wintoast RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) -install(FILES ${HEADER_FILES} DESTINATION include/wintoast) +# Install headers +if (INSTALL_HEADERS) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wintoastlib.h DESTINATION include/wintoast) +endif() \ No newline at end of file diff --git a/ports/wintoast/portfile.cmake b/ports/wintoast/portfile.cmake index 2676befd0b46b2..c7f2f895286d75 100644 --- a/ports/wintoast/portfile.cmake +++ b/ports/wintoast/portfile.cmake @@ -19,6 +19,9 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS_RELEASE -DINSTALL_HEADERS=ON + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF + ) vcpkg_install_cmake()