Merge pull request #1204 from codicodi/nana-1.5.1

[nana] update to 1.5.1

3 files changed, 12 insertions, 70 deletions

diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL
index 96d79560f..c8270c56a 100644
--- a/ports/nana/CONTROL
+++ b/ports/nana/CONTROL
@@ -1,4 +1,4 @@
 Source: nana

-Version: 1.4.1-66be23c9204c5567d1c51e6f57ba23bffa517a7c

+Version: 1.5.1-hotfix-42f8985

 Description: Cross-platform library for GUI programming in modern C++ style.

-Build-Depends: zlib, libpng, libjpeg-turbo

+Build-Depends: libpng, libjpeg-turbo

diff --git a/ports/nana/fix-linking.patch b/ports/nana/fix-linking.patch
deleted file mode 100644
index f897ed228..000000000
--- a/ports/nana/fix-linking.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c9c9c9..ae35185 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -149,26 +149,20 @@ endif ()
- # Find PNG
- if(NANA_CMAKE_ENABLE_PNG)
-     add_definitions(-DNANA_ENABLE_PNG)
--    set(NANA_LINKS "${NANA_LINKS} -lpng")
-     if(NANA_CMAKE_LIBPNG_FROM_OS)
--        find_package(PNG)
--        if (PNG_FOUND)
--            include_directories( ${PNG_INCLUDE_DIRS})
--            add_definitions(-DUSE_LIBPNG_FROM_OS)
--        endif(PNG_FOUND)
-+        find_package(PNG REQUIRED)
-+        include_directories(${PNG_INCLUDE_DIRS})
-+        add_definitions(-DUSE_LIBPNG_FROM_OS)
-     endif(NANA_CMAKE_LIBPNG_FROM_OS)
- endif(NANA_CMAKE_ENABLE_PNG)
- 
- # Find JPEG
- if(NANA_CMAKE_ENABLE_JPEG)
-     add_definitions(-DNANA_ENABLE_JPEG)
--    set(NANA_LINKS "${NANA_LINKS} -ljpeg")
-     if(NANA_CMAKE_LIBJPEG_FROM_OS)
--        find_package(JPEG)
--        if (JPEG_FOUND)
--            include_directories( ${JPEG_INCLUDE_DIRS})
--            add_definitions(-DUSE_LIBJPEG_FROM_OS)
--        endif(JPEG_FOUND)
-+        find_package(JPEG REQUIRED)
-+        include_directories(${JPEG_INCLUDE_DIRS})
-+        add_definitions(-DUSE_LIBJPEG_FROM_OS)
-     endif(NANA_CMAKE_LIBJPEG_FROM_OS)
- endif(NANA_CMAKE_ENABLE_JPEG)
- 
-@@ -253,7 +247,12 @@ endforeach(subdir ${NANA_SOURCE_SUBDIRS})
- 
- include_directories(${NANA_INCLUDE_DIR})
- add_library(${PROJECT_NAME} ${sources} )
--target_link_libraries(${PROJECT_NAME} ${NANA_LINKS}) 
-+if(NANA_CMAKE_ENABLE_JPEG AND NANA_CMAKE_LIBJPEG_FROM_OS)
-+    target_link_libraries(${PROJECT_NAME} ${JPEG_LIBRARIES})
-+endif()
-+if(NANA_CMAKE_ENABLE_PNG AND NANA_CMAKE_LIBPNG_FROM_OS)
-+    target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES})
-+endif()
- 
-  #  Headers: use INCLUDE_DIRECTORIES
-  #  Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES)
diff --git a/ports/nana/portfile.cmake b/ports/nana/portfile.cmake
index 117e41e23..f2b7fab17 100644
--- a/ports/nana/portfile.cmake
+++ b/ports/nana/portfile.cmake
@@ -1,35 +1,28 @@
-include(vcpkg_common_functions)

+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

+    message(STATUS "Warning: Dynamic building not supported. Building static.")

+    set(VCPKG_LIBRARY_LINKAGE static)

+endif()

 

+include(vcpkg_common_functions)

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO cnjinhao/nana

-    REF 66be23c9204c5567d1c51e6f57ba23bffa517a7c

-    SHA512 4f87acb51cc4bb2760402b33c81b6bd15a794b026dd31876a0ccc24a86f2c501b873f7bf3a57098e261fddc49d4935c39d13ae1595cb85b67bce337ae2fd3a0d

-    HEAD_REF master

+    REF 42f89854fd6795d9b2113d011a87404dcc9ba37e

+    SHA512 89b75ccb95e5c4a2075a59064de0b0ff2fca90f90e9b391c2def7f74cc7484930b7139e314f33250bfaa148bfc5a5c9cf78ae3cac2336e0f32a9651670c36685

+    HEAD_REF develop

 )

 

-vcpkg_apply_patches(

-    SOURCE_PATH ${SOURCE_PATH}

-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-linking.patch")

-

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

+    PREFER_NINJA

     OPTIONS

-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON

+        -DMSVC_USE_STATIC_RUNTIME=OFF # dont override our settings

         -DNANA_CMAKE_ENABLE_PNG=ON

         -DNANA_CMAKE_ENABLE_JPEG=ON

     OPTIONS_DEBUG

         -DNANA_CMAKE_INSTALL_INCLUDES=OFF)

 

 vcpkg_install_cmake()

-

-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

-    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/nana.dll

-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)

-    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/nana.dll

-        DESTINATION ${CURRENT_PACKAGES_DIR}/bin)

-endif()

-

 vcpkg_copy_pdbs()

 

 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/nana)