set CMAKE_SYSTEM_PROCESSOR in Linux (microsoft#6872)

* add vcpkg_target_architecture to vcpkg_configure_cmake * modify shogun and thrift * update glbinding
andrm · Jun 14, 2019 · 9cc9978 · 9cc9978
1 parent 8c288f4
commit 9cc9978
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake
@@ -18,6 +18,7 @@ vcpkg_configure_cmake(
         -DOPTION_BUILD_TOOLS=OFF
         -DGIT_REV=0
         -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON
+        -DOPTION_BUILD_EXAMPLES=OFF
 )
 
 vcpkg_install_cmake()

diff --git a/ports/shogun/CONTROL b/ports/shogun/CONTROL
@@ -1,4 +1,4 @@
 Source: shogun
-Version: 6.1.3-2
+Version: 6.1.3-3
 Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64&!osx), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
 Description: Unified and efficient Machine Learning
diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake
@@ -60,6 +60,7 @@ vcpkg_configure_cmake(
         -DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=TRUE
         -DCMAKE_DISABLE_FIND_PACKAGE_Ctags=TRUE
         -DCMAKE_DISABLE_FIND_PACKAGE_CCache=TRUE
+        -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=TRUE
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE
         -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=${CMAKE_DISABLE_FIND_PACKAGE_BLAS}
 

diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL
@@ -1,4 +1,4 @@
 Source: thrift
-Version: 2019-05-07
+Version: 2019-05-07-1
 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit
 Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010.
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
@@ -27,6 +27,7 @@ vcpkg_configure_cmake(
         -DBUILD_HASKELL=off
         -DBUILD_TUTORIALS=off
         -DFLEX_EXECUTABLE=${FLEX}
+        -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE
         -DBISON_EXECUTABLE=${BISON}
 )
 

diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -207,6 +207,7 @@ function(vcpkg_configure_cmake)
         "-DVCPKG_C_FLAGS_DEBUG=${VCPKG_C_FLAGS_DEBUG}"
         "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}"
         "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
+        "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
         "-DCMAKE_INSTALL_LIBDIR:STRING=lib"
         "-DCMAKE_INSTALL_BINDIR:STRING=bin"
     )

diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake
@@ -4,6 +4,9 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
     set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
 endif()
 set(CMAKE_SYSTEM_NAME Linux CACHE STRING "")
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+   set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "")
+endif()
 
 get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
 if(NOT _CMAKE_IN_TRY_COMPILE)