From f558c26e3fd6be0e05ef59623b0b917aaa07cba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 21 Jan 2021 11:11:39 +0100 Subject: [PATCH 1/7] Test_without_eigen_path_in_ci_script --- CI/Windows.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index 3269b6bf..27375c5a 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -120,7 +120,7 @@ IF EXIST %QT_INSTALL_PATH%\ ( ) -"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DEigen3_DIR="e:\libs\general\Eigen3.3.9\share\eigen3\cmake" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% .. +"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% .. %VS_PATH% /Build "Release" OpenMesh.sln /Project "ALL_BUILD" @@ -142,7 +142,7 @@ mkdir build-debug cd build-debug -"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DEigen3_DIR="e:\libs\general\Eigen3.3.9\share\eigen3\cmake" -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_SHARED=%SHARED% -DBUILD_APPS=%APPS% %CMAKE_CONFIGURATION% .. +"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_SHARED=%SHARED% -DBUILD_APPS=%APPS% %CMAKE_CONFIGURATION% .. %VS_PATH% /Build "Debug" OpenMesh.sln /Project "ALL_BUILD" From e416517c59f3b34e73f104295d2b22549d19e491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 21 Jan 2021 11:45:23 +0100 Subject: [PATCH 2/7] Specify language in project call --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5efa3d46..b294c611 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,9 @@ set( CMAKE_CXX_STANDARD 11 ) enable_testing() -project (OpenMesh VERSION 9.0.0) +project (OpenMesh + VERSION 9.0.0 + LANGUAGES CXX ) # Set AUTO UIC/MOC Policy to new for CMAKE 3.17 or higher if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") From b919ead53b2e7b6bf9134ca21a13e2f4a873326f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 21 Jan 2021 11:50:48 +0100 Subject: [PATCH 3/7] Specify language in project call --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b294c611..5b7fa82b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ enable_testing() project (OpenMesh VERSION 9.0.0 - LANGUAGES CXX ) + LANGUAGES C CXX ) # Set AUTO UIC/MOC Policy to new for CMAKE 3.17 or higher if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") From 19b38a5b8b21a816fa67d46711113b14469efad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 21 Jan 2021 12:18:26 +0100 Subject: [PATCH 4/7] Only include flags if the corresponding language is available --- CMakeLists.txt | 2 +- cmake-library | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b7fa82b..b294c611 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ enable_testing() project (OpenMesh VERSION 9.0.0 - LANGUAGES C CXX ) + LANGUAGES CXX ) # Set AUTO UIC/MOC Policy to new for CMAKE 3.17 or higher if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") diff --git a/cmake-library b/cmake-library index bce3f7ba..7399ec4e 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit bce3f7ba87397b0e8d54394aafd447402e3ee9dd +Subproject commit 7399ec4ec36ec9bf1f3f135b9c96bc37181ee1f5 From 243bb928d8677a2d7387543e67ded7bce61b0cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 21 Jan 2021 12:36:16 +0100 Subject: [PATCH 5/7] Fixed library --- cmake-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index 7399ec4e..3ed14638 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit 7399ec4ec36ec9bf1f3f135b9c96bc37181ee1f5 +Subproject commit 3ed14638f8c44d6c923343cc03f081ad5ae00488 From a76898f12ae3d594cdf0687a205974fb458519f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 21 Jan 2021 12:48:51 +0100 Subject: [PATCH 6/7] Remove VS 11 definition (not supported anymore) --- src/Unittests/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Unittests/CMakeLists.txt b/src/Unittests/CMakeLists.txt index 22595feb..0c2a61d4 100644 --- a/src/Unittests/CMakeLists.txt +++ b/src/Unittests/CMakeLists.txt @@ -34,10 +34,6 @@ if ( OPENMESH_BUILD_UNIT_TESTS ) message(WARNING "Eigen3 not found! This will skip the Eigen3 Unittests. You can point cmake to Eigen3 by setting Eigen3_DIR to the cmake files of Eigen3") endif() - if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) - add_definitions( /D _VARIADIC_MAX=10 ) - endif() - # Create new target named unittests_hexmeshing FILE(GLOB UNITTEST_SRC *.cc) # Create unittest executable From ff1747f7d101a6e3daca3b436bef266a72f8ac3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 21 Jan 2021 13:37:30 +0100 Subject: [PATCH 7/7] Argument parsing is still C --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b294c611..fc804660 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) # Set and enforce C++-11 flags @@ -10,7 +10,7 @@ enable_testing() project (OpenMesh VERSION 9.0.0 - LANGUAGES CXX ) + LANGUAGES C CXX ) # Set AUTO UIC/MOC Policy to new for CMAKE 3.17 or higher if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17")