Merge branch 'master' of https://github.com/Microsoft/vcpkg into qca

10 files changed, 112 insertions, 12 deletions

diff --git a/ports/jxrlib/CMakeLists.txt b/ports/jxrlib/CMakeLists.txt
index d9ac84fb6..17f16bea4 100644
--- a/ports/jxrlib/CMakeLists.txt
+++ b/ports/jxrlib/CMakeLists.txt
@@ -62,7 +62,7 @@ JXR_MAKE_OBJ(ENC)
 
 add_library(jpegxr ${OBJ_ENC} ${OBJ_DEC} ${OBJ_SYS})
 set_property(TARGET jpegxr
-  PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
+  PROPERTY COMPILE_DEFINITIONS DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
 )
 set_property(TARGET jpegxr PROPERTY LINK_INTERFACE_LIBRARIES "")
 install(TARGETS jpegxr
@@ -80,7 +80,7 @@ JXR_MAKE_OBJ(TEST)
 
 add_library(jxrglue ${OBJ_GLUE} ${OBJ_TEST})
 set_property(TARGET jxrglue
-  PROPERTY COMPILE_DEFINITIONS __ANSI__ DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
+  PROPERTY COMPILE_DEFINITIONS DISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}
 )
 set_property(TARGET jxrglue PROPERTY LINK_INTERFACE_LIBRARIES "")
 install(TARGETS jxrglue
diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL
index 7c3d5d603..062850e06 100644
--- a/ports/jxrlib/CONTROL
+++ b/ports/jxrlib/CONTROL
@@ -1,3 +1,3 @@
 Source: jxrlib
-Version: 1.1-1
+Version: 1.1-2
 Description: Open source implementation of the jpegxr image format standard.
diff --git a/ports/libpq/CMakeLists.txt b/ports/libpq/CMakeLists.txt
index 517039d8f..54e929a5b 100644
--- a/ports/libpq/CMakeLists.txt
+++ b/ports/libpq/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 project(libpq VERSION 9.6.1 LANGUAGES C)
 
 find_package(OpenSSL REQUIRED)
+set(CMAKE_DEBUG_POSTFIX "d")
 configure_file(${CMAKE_CURRENT_LIST_DIR}/src/include/pg_config.h.win32 ${CMAKE_CURRENT_LIST_DIR}/src/include/pg_config.h)
 configure_file(${CMAKE_CURRENT_LIST_DIR}/src/include/pg_config_ext.h.win32 ${CMAKE_CURRENT_LIST_DIR}/src/include/pg_config_ext.h)
 configure_file(${CMAKE_CURRENT_LIST_DIR}/src/include/port/win32.h ${CMAKE_CURRENT_LIST_DIR}/src/include/pg_config_os.h)
@@ -61,11 +62,14 @@ set(pg_libpq_catalog_interface
     src/include/catalog/genbki.h
 )
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_DEBUG_POSTFIX "d")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_library(libpq ${pg_port_src} ${pg_backend_src} ${pg_libpq_src})
 target_compile_definitions(libpq PRIVATE -DFRONTEND -DENABLE_THREAD_SAFETY -DUSE_OPENSSL -D_CRT_SECURE_NO_WARNINGS)
 target_link_libraries(libpq PRIVATE OpenSSL::SSL ws2_32 secur32 advapi32 shell32)
 target_include_directories(libpq PRIVATE src/include src/include/port/win32 src/include/port/win32_msvc src/port)
 set_target_properties(libpq PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
 install(TARGETS libpq
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 67a45dba0..50ac67bb7 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -29,4 +29,5 @@ file(COPY ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lib
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libpq/COPYRIGHT ${CURRENT_PACKAGES_DIR}/share/libpq/copyright)
 
 
-vcpkg_copy_pdbs()
+
+vcpkg_copy_pdbs()
\ No newline at end of file
diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL
new file mode 100644
index 000000000..e7692526f
--- /dev/null
+++ b/ports/nana/CONTROL
@@ -0,0 +1,4 @@
+Source: nana

+Version: 1.4.1

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

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

diff --git a/ports/nana/fix-linking.patch b/ports/nana/fix-linking.patch
new file mode 100644
index 000000000..a687e228b
--- /dev/null
+++ b/ports/nana/fix-linking.patch
@@ -0,0 +1,51 @@
+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
new file mode 100644
index 000000000..66fca68fa
--- /dev/null
+++ b/ports/nana/portfile.cmake
@@ -0,0 +1,36 @@
+

+include(vcpkg_common_functions)

+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/nana)

+vcpkg_download_distfile(ARCHIVE

+    URLS "http://downloads.sourceforge.net/project/nanapro/Nana/Nana 1.x/nana 1.4.1.zip"

+    FILENAME "nana 1.4.1.zip"

+    SHA512 38a4fe4c9f932d0e69753c0c1e28d0c8f7cc1ab73c639b87dd5ba102ed25da1ee04c93ec5d6bb79945f7bc118cc131022604c75c1bb6eaced3a071eb137115cd)

+

+vcpkg_extract_source_archive(${ARCHIVE})

+

+vcpkg_apply_patches(

+    SOURCE_PATH ${SOURCE_PATH}

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

+

+vcpkg_configure_cmake(

+    SOURCE_PATH ${SOURCE_PATH}

+    OPTIONS

+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON

+        -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_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/nana)

+file(RENAME ${CURRENT_PACKAGES_DIR}/share/nana/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/nana/copyright)

diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL
index accc2ba07..e38a2c835 100644
--- a/ports/qt5/CONTROL
+++ b/ports/qt5/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5
 Version: 5.7-1
-Build-Depends:
 Description: Qt5 application framework main components. Webengine, examples and tests not included.
+Build-Depends: sqlite3, libpq
\ No newline at end of file
diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake
index 85ebb107b..3cc3a17bb 100644
--- a/ports/qt5/portfile.cmake
+++ b/ports/qt5/portfile.cmake
@@ -13,7 +13,8 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
 get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY)
 set(ENV{PATH} "${JOM_EXE_PATH};${PYTHON3_EXE_PATH};${PERL_EXE_PATH};$ENV{PATH}")
-
+set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}")
+set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}")
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "http://download.qt.io/official_releases/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.7z"
     FILENAME "qt-5.7.0.7z"
@@ -44,7 +45,11 @@ vcpkg_execute_required_process(
     COMMAND "${SOURCE_PATH}/configure.bat"
         -confirm-license -opensource -platform win32-msvc2015
         -debug-and-release -force-debug-info ${QT_RUNTIME_LINKAGE}
+        -qt-zlib
+        -qt-libjpeg
+        -system-sqlite
         -nomake examples -nomake tests -skip webengine
+        -qt-sql-sqlite -qt-sql-psql
         -prefix ${CURRENT_PACKAGES_DIR}
         -bindir ${CURRENT_PACKAGES_DIR}/bin
         -hostbindir ${CURRENT_PACKAGES_DIR}/tools
@@ -67,7 +72,7 @@ message(STATUS "Build ${TARGET_TRIPLET} done")
 
 message(STATUS "Installing ${TARGET_TRIPLET}")
 vcpkg_execute_required_process(
-    COMMAND ${JOM} install
+    COMMAND ${JOM} -j1 install
     WORKING_DIRECTORY ${OUTPUT_PATH}
     LOGNAME install-${TARGET_TRIPLET}
 )
@@ -151,3 +156,4 @@ vcpkg_execute_required_process(
 file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION  ${CURRENT_PACKAGES_DIR}/share/qt5 RENAME copyright)
 
 vcpkg_copy_pdbs()
+
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 44db05a22..7be93e54d 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -49,7 +49,6 @@ if(NOT VCPKG_TOOLCHAIN)
         list(APPEND CMAKE_LIBRARY_PATH
             ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link
         )
-        link_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link)
     endif()
     list(APPEND CMAKE_PREFIX_PATH
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}
@@ -57,9 +56,6 @@ if(NOT VCPKG_TOOLCHAIN)
     list(APPEND CMAKE_LIBRARY_PATH
         ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link
     )
-    link_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link)
-
-    include_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
 
     set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
 
@@ -83,7 +79,9 @@ if(NOT VCPKG_TOOLCHAIN)
     function(add_library name)
         _add_library(${ARGV})
         list(FIND ARGV "IMPORTED" IMPORTED_IDX)
-        if(IMPORTED_IDX EQUAL -1)
+        list(FIND ARGV "INTERFACE" INTERFACE_IDX)
+        list(FIND ARGV "ALIAS" ALIAS_IDX)
+        if(IMPORTED_IDX EQUAL -1 AND INTERFACE_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1)
             set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false)
         endif()
     endfunction()