microsoft · vicroms · May 31, 2019 · May 9, 2019 · May 13, 2019 · May 13, 2019
diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake
@@ -50,7 +50,7 @@ file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG
 string(REPLACE "get_filename_component(ASSIMP_ROOT_DIR \"\${_PREFIX}\" PATH)"
                "set(ASSIMP_ROOT_DIR \${_PREFIX})" ASSIMP_CONFIG ${ASSIMP_CONFIG})
 
-if(WIN32)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
   string(REPLACE "set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARIES})"
                  "set( ASSIMP_LIBRARIES optimized \${ASSIMP_LIBRARY_DIRS}/\${ASSIMP_LIBRARIES}.lib debug \${ASSIMP_LIBRARY_DIRS}/../debug/lib/\${ASSIMP_LIBRARIES}d.lib)" ASSIMP_CONFIG ${ASSIMP_CONFIG})
 else()

diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL
@@ -1,4 +1,4 @@
 Source: blaze
 Version: 3.5
-Build-Depends: clapack, boost-exception
+Build-Depends: clapack (!osx), boost-exception
 Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
diff --git a/ports/ceres/0003_remove_unnecessary_cmake_modules.patch b/ports/ceres/0003_remove_unnecessary_cmake_modules.patch
diff --git a/ports/ceres/0004_use_glog_target.patch → ports/ceres/0003_use_glog_target.patch b/ports/ceres/0004_use_glog_target.patch → ports/ceres/0003_use_glog_target.patch
diff --git a/...eres/0005_fix_exported_ceres_config.patch → ...eres/0004_fix_exported_ceres_config.patch b/...eres/0005_fix_exported_ceres_config.patch → ...eres/0004_fix_exported_ceres_config.patch
diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL
@@ -1,11 +1,10 @@
 Source: ceres
-Version: 1.14.0-3
-# eigen is always required by CMake, even if it isn't used.
+Version: 1.14.0-4
 Build-Depends: glog, eigen3
 Description: non-linear optimization package
 
 Feature: lapack
-Build-Depends: clapack
+Build-Depends: clapack (!osx)
 Description: Use Lapack in Ceres
 
 Feature: suitesparse

diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake
@@ -17,11 +17,16 @@ vcpkg_from_github(
     PATCHES
         0001_add_missing_include_path.patch
         0002_cmakelists_fixes.patch
-        0003_remove_unnecessary_cmake_modules.patch
-        0004_use_glog_target.patch
-        0005_fix_exported_ceres_config.patch
+        0003_use_glog_target.patch
+        0004_fix_exported_ceres_config.patch
 )
 
+file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake)
+file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake)
+#file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake)
+file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake)
+#file(REMOVE ${SOURCE_PATH}/cmake/FindTBB.cmake)
+
 set(SUITESPARSE OFF)
 if("suitesparse" IN_LIST FEATURES)
     set(SUITESPARSE ON)
@@ -59,14 +64,12 @@ vcpkg_configure_cmake(
         -DEIGENSPARSE=${EIGENSPARSE}
         -DLAPACK=${LAPACK}
         -DSUITESPARSE=${SUITESPARSE}
-        -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=ON
-        -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this.
         -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE}
 )
 
 vcpkg_install_cmake()
 
-if(WIN32)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
   vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
 else()
   vcpkg_fixup_cmake_targets(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres")
@@ -75,7 +78,7 @@ endif()
 vcpkg_copy_pdbs()
 
 # Changes target search path
-if(WIN32)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
   file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS)
   string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n    \${CERES_CURRENT_CONFIG_DIR}/../"
                  "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n    \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}")

diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
@@ -1,4 +1,4 @@
 Source: clapack
-Version: 3.2.1-4
+Version: 3.2.1-6
 Description: CLAPACK (f2c'ed version of LAPACK)
 Build-Depends: openblas (!osx)
diff --git a/ports/clapack/fix-lack-library.patch b/ports/clapack/fix-lack-library.patch
diff --git a/ports/clapack/fix-linux-build.patch b/ports/clapack/fix-linux-build.patch
diff --git a/ports/clapack/lapack-config.cmake b/ports/clapack/lapack-config.cmake
@@ -0,0 +1,186 @@
+#.rst:
+# clapack config for vcpkg
+# ------------
+#
+# Find the clapack includes and library.
+#
+# Result Variables
+# ^^^^^^^^^^^^^^^^
+#
+# This script defines the following variables:
+#
+# ``CLAPACK_FOUND``
+#   True if clapack library found
+#
+# ``CLAPACK_VERSION``
+#   Containing the clapack version tag (manually defined)
+#
+# ``CLAPACK_INCLUDE_DIR``
+#   Location of clapack headers
+#
+# ``CLAPACK_LIBRARY``
+#   List of libraries to link with when using clapack
+#
+# Result Targets
+# ^^^^^^^^^^^^^^
+#
+# This script defines the following targets:
+#
+# ``clapack::clapack``
+#   Target to use clapack
+#
+# Compatibility Variables
+# ^^^^^^^^^^^^^^^^^^^^^^^
+#
+# This script defines the following variables for compatibility reasons:
+#
+# ``F2C_FOUND``
+#   True if f2c (fortran-to-c wrap layer) library found
+#
+# ``F2C_INCLUDE_DIR``
+#   Location of clapack headers
+#
+# ``F2C_LIBRARY``
+#   Library containing the fortran-to-c wrap layer, necessary for clapack and automatically included when used
+#
+# ``LAPACK_FOUND``
+#   True if clapack library found
+#
+# ``LAPACK_VERSION``
+#   Containing the clapack version tag (manually defined)
+#
+# ``LAPACK_INCLUDE_DIR``
+#   Location of clapack headers
+#
+# ``LAPACK_LIBRARY``
+#   List of libraries to link with when using clapack
+#
+# Compatibility Targets
+# ^^^^^^^^^^^^^^
+#
+# This script defines the following targets for compatibility reasons:
+#
+# ``lapack``
+#   Target to use lapack
+
+include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
+include(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+
+set(CLAPACK_VERSION "3.2.1")
+
+if(UNIX)
+  find_library(ADDITIONAL_LAPACK_LIBRARY m)
+endif()
+
+if(NOT F2C_LIBRARY)
+    find_library(F2C_LIBRARY_RELEASE NAMES f2c)
+    find_library(F2C_LIBRARY_DEBUG NAMES f2cd)
+    select_library_configurations(F2C)
+endif()
+
+if(NOT LAPACK_LIBRARY)
+    find_library(LAPACK_LIBRARY_RELEASE NAMES lapack)
+    find_library(LAPACK_LIBRARY_DEBUG NAMES lapackd)
+    select_library_configurations(LAPACK)
+endif()
+
+list(APPEND LAPACK_LIBRARY ${F2C_LIBRARY})
+list(APPEND LAPACK_LIBRARY ${ADDITIONAL_LAPACK_LIBRARY})
+
+set(F2C_LIBRARIES "${F2C_LIBRARY}" CACHE STRING "" FORCE)
+set(LAPACK_VERSION "${CLAPACK_VERSION}" CACHE STRING "" FORCE)
+set(LAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
+set(CLAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
+set(CLAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
+
+if(NOT F2C_INCLUDE_DIR)
+  find_path(F2C_INCLUDE_DIR NAMES f2c.h)
+endif()
+
+if(NOT LAPACK_INCLUDE_DIR)
+  find_path(LAPACK_INCLUDE_DIR NAMES clapack.h)
+endif()
+
+list(APPEND LAPACK_INCLUDE_DIR ${F2C_INCLUDE_DIR})
+set(LAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
+set(CLAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
+set(CLAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
+set(F2C_INCLUDE_DIRS "${F2C_INCLUDE_DIR}" CACHE PATH "" FORCE)
+
+if(WIN32)
+  string( REPLACE ".lib" ".dll" LAPACK_LIBRARY_RELEASE_DLL "${LAPACK_LIBRARY_RELEASE}" )
+  string( REPLACE ".lib" ".dll" LAPACK_LIBRARY_DEBUG_DLL   "${LAPACK_LIBRARY_DEBUG}" )
+  string( REPLACE ".lib" ".dll" F2C_LIBRARY_RELEASE_DLL    "${F2C_LIBRARY_RELEASE}" )
+  string( REPLACE ".lib" ".dll" F2C_LIBRARY_DEBUG_DLL      "${F2C_LIBRARY_DEBUG}" )
+endif()
+
+find_package_handle_standard_args(CLAPACK DEFAULT_MSG CLAPACK_LIBRARY CLAPACK_INCLUDE_DIR)
+mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY)
+
+find_package_handle_standard_args(LAPACK  DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR)
+mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY)
+
+find_package_handle_standard_args(F2C     DEFAULT_MSG F2C_LIBRARY F2C_INCLUDE_DIR)
+mark_as_advanced(F2C_INCLUDE_DIR F2C_LIBRARY)
+
+#TARGETS
+if( CLAPACK_FOUND AND NOT TARGET clapack::clapack )
+  if( EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}" )
+    add_library( clapack::clapack      SHARED IMPORTED )
+    set_target_properties( clapack::clapack PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${LAPACK_LIBRARY_RELEASE_DLL}"
+      IMPORTED_IMPLIB                   "${LAPACK_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${LAPACK_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}" )
+      set_property( TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( clapack::clapack PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${LAPACK_LIBRARY_DEBUG_DLL}"
+        IMPORTED_IMPLIB_DEBUG             "${LAPACK_LIBRARY_DEBUG}" )
+    endif()
+  else()
+    add_library( clapack::clapack      UNKNOWN IMPORTED )
+    set_target_properties( clapack::clapack PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${LAPACK_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${LAPACK_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${LAPACK_LIBRARY_DEBUG}" )
+      set_property( TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( clapack::clapack PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${LAPACK_LIBRARY_DEBUG}" )
+    endif()
+  endif()
+endif()
+
+if( CLAPACK_FOUND AND NOT TARGET lapack )
+  if( EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}" )
+    add_library( lapack      SHARED IMPORTED )
+    set_target_properties( lapack PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${LAPACK_LIBRARY_RELEASE_DLL}"
+      IMPORTED_IMPLIB                   "${LAPACK_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${LAPACK_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}" )
+      set_property( TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( lapack PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${LAPACK_LIBRARY_DEBUG_DLL}"
+        IMPORTED_IMPLIB_DEBUG             "${LAPACK_LIBRARY_DEBUG}" )
+    endif()
+  else()
+    add_library( lapack      UNKNOWN IMPORTED )
+    set_target_properties( lapack PROPERTIES
+      IMPORTED_LOCATION_RELEASE         "${LAPACK_LIBRARY_RELEASE}"
+      INTERFACE_INCLUDE_DIRECTORIES     "${LAPACK_INCLUDE_DIR}"
+      IMPORTED_CONFIGURATIONS           Release
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C" )
+    if( EXISTS "${LAPACK_LIBRARY_DEBUG}" )
+      set_property( TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug )
+      set_target_properties( lapack PROPERTIES
+        IMPORTED_LOCATION_DEBUG           "${LAPACK_LIBRARY_DEBUG}" )
+    endif()
+  endif()
+endif()