[eigen3] Disable Eigen3 configure checks (#23587)

* [eigen3] remove slow configure checks

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
This commit is contained in:
Alexander Neumann 2022-03-17 21:52:10 +01:00 committed by GitHub
parent bb2ede8b98
commit a8f5cef859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 1 deletions

View File

@ -7,6 +7,7 @@ vcpkg_from_gitlab(
REF 3.4.0
SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
HEAD_REF master
PATCHES remove_configure_checks.patch # This removes unnecessary configure checks. Eigen3 just installs headers not anything more.
)
vcpkg_cmake_configure(

View File

@ -0,0 +1,37 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3e69b845..12fb2188d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,12 +66,14 @@ option(EIGEN_TEST_CXX11 "Enable testing with C++11 and C++11 features (e.g. Tens
macro(ei_add_cxx_compiler_flag FLAG)
+ if(FALSE) # Since eigen3 is header only and vcpkg does not build tests this can be disabled by default.
string(REGEX REPLACE "-" "" SFLAG1 ${FLAG})
string(REGEX REPLACE "\\+" "p" SFLAG ${SFLAG1})
check_cxx_compiler_flag(${FLAG} COMPILER_SUPPORT_${SFLAG})
if(COMPILER_SUPPORT_${SFLAG})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}")
endif()
+ endif()
endmacro()
check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11)
@@ -142,7 +144,7 @@ endif()
set(EIGEN_TEST_MAX_SIZE "320" CACHE STRING "Maximal matrix/vector size, default is 320")
-if(NOT MSVC)
+if(NOT MSVC AND FALSE)
# We assume that other compilers are partly compatible with GNUCC
# clang outputs some warnings for unknown flags that are not caught by check_cxx_compiler_flag
@@ -330,7 +332,7 @@ if(NOT MSVC)
endif()
endif()
-else()
+elseif(FALSE)
# C4127 - conditional expression is constant
# C4714 - marked as __forceinline not inlined (I failed to deactivate it selectively)

View File

@ -1,8 +1,10 @@
{
"name": "eigen3",
"version": "3.4.0",
"port-version": 1,
"description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.",
"homepage": "http://eigen.tuxfamily.org",
"license": "MPL-2.0",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -2022,7 +2022,7 @@
},
"eigen3": {
"baseline": "3.4.0",
"port-version": 0
"port-version": 1
},
"elfio": {
"baseline": "3.10",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4b40326590314e1f3a08c75e83a42d0738040b68",
"version": "3.4.0",
"port-version": 1
},
{
"git-tree": "0475ed327bda734cad0acd35978cde9379bc8619",
"version": "3.4.0",