Merge branch 'master' into vcpkg_nuget

7 files changed, 44 insertions, 22 deletions

diff --git a/ports/ceres/0001_add_missing_include_path.patch b/ports/ceres/0001_add_missing_include_path.patch
deleted file mode 100644
index 8bb8dfb50..000000000
--- a/ports/ceres/0001_add_missing_include_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 02c72b5..15a947e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -582,7 +582,7 @@ include_directories(
- # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS
- # used by clients after find_package(Ceres) does not identify Eigen as
- # as system headers.
--include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
-+include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}/Eigen)
- 
- if (SUITESPARSE)
-   include_directories(${SUITESPARSE_INCLUDE_DIRS})
diff --git a/ports/ceres/0002_cmakelists_fixes.patch b/ports/ceres/0001_cmakelists_fixes.patch
index f806794a8..f269f05ee 100644
--- a/ports/ceres/0002_cmakelists_fixes.patch
+++ b/ports/ceres/0001_cmakelists_fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 15a947e..62d8c59 100644
+index 02c72b5..62d8c59 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -374,27 +374,7 @@ if (MINIGLOG)
@@ -31,6 +31,15 @@ index 15a947e..62d8c59 100644
  endif (MINIGLOG)
  
  if (NOT SCHUR_SPECIALIZATIONS)
+@@ -582,7 +562,7 @@ include_directories(
+ # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS
+ # used by clients after find_package(Ceres) does not identify Eigen as
+ # as system headers.
+-include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
++include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}/Eigen)
+ 
+ if (SUITESPARSE)
+   include_directories(${SUITESPARSE_INCLUDE_DIRS})
 @@ -917,8 +897,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
          DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
  install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake"
diff --git a/ports/ceres/0003_use_glog_target.patch b/ports/ceres/0002_use_glog_target.patch
index 6ca328a8e..6ca328a8e 100644
--- a/ports/ceres/0003_use_glog_target.patch
+++ b/ports/ceres/0002_use_glog_target.patch
diff --git a/ports/ceres/0004_fix_exported_ceres_config.patch b/ports/ceres/0003_fix_exported_ceres_config.patch
index 5cc41013e..5cc41013e 100644
--- a/ports/ceres/0004_fix_exported_ceres_config.patch
+++ b/ports/ceres/0003_fix_exported_ceres_config.patch
diff --git a/ports/ceres/0004_blas_linux_fix.patch b/ports/ceres/0004_blas_linux_fix.patch
new file mode 100644
index 000000000..5fffee5e2
--- /dev/null
+++ b/ports/ceres/0004_blas_linux_fix.patch
@@ -0,0 +1,22 @@
+diff --git a/internal/ceres/blas.cc b/internal/ceres/blas.cc
+index 3ba63bb..071a26e 100644
+--- a/internal/ceres/blas.cc
++++ b/internal/ceres/blas.cc
+@@ -33,7 +33,7 @@
+ #include "glog/logging.h"
+ 
+ #ifndef CERES_NO_LAPACK
+-extern "C" void dsyrk_(char* uplo,
++extern "C" void dsyrk(char* uplo,
+                        char* trans,
+                        int* n,
+                        int* k,
+@@ -64,7 +64,7 @@ void BLAS::SymmetricRankKUpdate(int num_rows,
+   int k = transpose ? num_rows : num_cols;
+   int lda = k;
+   int ldc = n;
+-  dsyrk_(&uplo,
++  dsyrk(&uplo,
+          &trans,
+          &n,
+          &k,
diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL
index 8cd34102e..850da31a6 100644
--- a/ports/ceres/CONTROL
+++ b/ports/ceres/CONTROL
@@ -1,5 +1,5 @@
 Source: ceres
-Version: 1.14.0-4
+Version: 1.14.0-6
 Build-Depends: glog, eigen3
 Homepage: https://github.com/ceres-solver/ceres-solver
 Description: non-linear optimization package
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake
index f1b21d647..66481fc09 100644
--- a/ports/ceres/portfile.cmake
+++ b/ports/ceres/portfile.cmake
@@ -1,3 +1,5 @@
+include(vcpkg_common_functions)
+
 set(MSVC_USE_STATIC_CRT_VALUE OFF)
 if(VCPKG_CRT_LINKAGE STREQUAL "static")
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -6,7 +8,9 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static")
     set(MSVC_USE_STATIC_CRT_VALUE ON)
 endif()
 
-include(vcpkg_common_functions)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(ADDITIONAL_PATCH "0004_blas_linux_fix.patch")
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -15,10 +19,10 @@ vcpkg_from_github(
     SHA512 6dddddf5bd5834332a69add468578ad527e4d94fe85c9751ddf5fe9ad11a34918bdd9c994c49dd6ffc398333d0ac9752ac89aaef1293e2fe0a55524e303d415d
     HEAD_REF master
     PATCHES
-        0001_add_missing_include_path.patch
-        0002_cmakelists_fixes.patch
-        0003_use_glog_target.patch
-        0004_fix_exported_ceres_config.patch
+        0001_cmakelists_fixes.patch
+        0002_use_glog_target.patch
+        0003_fix_exported_ceres_config.patch
+        ${ADDITIONAL_PATCH}
 )
 
 file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake)
@@ -70,9 +74,9 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-  vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+  vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
 else()
-  vcpkg_fixup_cmake_targets(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres")
+  vcpkg_fixup_cmake_targets(CONFIG_PATH lib${LIB_SUFFIX}/cmake/Ceres)
 endif()
 
 vcpkg_copy_pdbs()