From bcf0136e0175eb5d405a03c4592fd6a766b5e7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 26 Oct 2018 16:04:42 +0200 Subject: [PATCH 1/7] - Removed VS2012 - Added checks for Libpath and QT5 install path --- CI/Windows.bat | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index c96a9e6c..117056ce 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -16,22 +16,6 @@ IF "%SHARED%" == "TRUE" ( set STRING_DLL= ) -IF "%BUILD_PLATFORM%" == "VS2012" ( - set LIBPATH=E:\libs\VS2012 - set GTESTVERSION=gtest-1.6.0 - set GENERATOR=Visual Studio 11%ARCH_VS% - set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.com" - IF "%ARCHITECTURE%" == "x64" ( - set QT_INSTALL_PATH=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\ - set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe - ) - - IF "%ARCHITECTURE%" == "x32" ( - set QT_INSTALL_PATH=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\ - set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe - ) -) - IF "%BUILD_PLATFORM%" == "VS2013" ( set LIBPATH=E:\libs\VS2013 set GTESTVERSION=gtest-1.6.0 @@ -95,6 +79,9 @@ IF "%APPS%" == "ON" ( set CMAKE_CONFIGURATION= ) + + + ECHO "=============================================================" ECHO "=============================================================" ECHO "Building with :" @@ -111,7 +98,23 @@ ECHO "QT_INSTALL_PATH : %QT_INSTALL_PATH%" ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%" ECHO "=============================================================" ECHO "=============================================================" +ECHO "" +ECHO "Running Build environment checks" + +IF EXIST %LIBPATH%\ ( + ECHO "LIBPATH ... Ok" +) ELSE ( + ECHO "LIBPATH not found!" + exit 10; +) + +IF EXIST %QT_INSTALL_PATH%\ ( + ECHO "QT_INSTALL_PATH ... Ok" +) ELSE ( + ECHO "QT_INSTALL_PATH not found!" + exit 10; +) "C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%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% .. -- GitLab From 02cbf68bb58601a5abbb8c58cf4f810cb68f9a0a Mon Sep 17 00:00:00 2001 From: Kersten Schuster Date: Tue, 30 Oct 2018 08:59:02 +0100 Subject: [PATCH 2/7] Update Windows.bat --- CI/Windows.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index 117056ce..819a9854 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -67,6 +67,8 @@ IF "%BUILD_PLATFORM%" == "VS2017" ( IF "%APPS%" == "ON" ( set STRING_APPS= + ECHO "Copying Platform plugins from %QT_INSTALL_PATH%\plugins\platforms to Build\plugins\platforms" + REM Create the platform plugins subdirectory for the qt plugins required to run the gui apps mkdir Build\plugins mkdir Build\plugins\platforms @@ -112,7 +114,7 @@ IF EXIST %LIBPATH%\ ( IF EXIST %QT_INSTALL_PATH%\ ( ECHO "QT_INSTALL_PATH ... Ok" ) ELSE ( - ECHO "QT_INSTALL_PATH not found!" + ECHO "QT_INSTALL_PATH: %QT_INSTALL_PATH%\ not found!" exit 10; ) -- GitLab From 7d62f473bcf559d6c019ef20515007dd07c22735 Mon Sep 17 00:00:00 2001 From: Kersten Schuster Date: Tue, 30 Oct 2018 09:00:39 +0100 Subject: [PATCH 3/7] Update Windows.bat --- CI/Windows.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CI/Windows.bat b/CI/Windows.bat index 819a9854..13cead8f 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -69,6 +69,8 @@ IF "%APPS%" == "ON" ( ECHO "Copying Platform plugins from %QT_INSTALL_PATH%\plugins\platforms to Build\plugins\platforms" + dir + REM Create the platform plugins subdirectory for the qt plugins required to run the gui apps mkdir Build\plugins mkdir Build\plugins\platforms -- GitLab From 2df6d72fbdb60413ee7129236e14807d48466a96 Mon Sep 17 00:00:00 2001 From: Kersten Schuster Date: Tue, 30 Oct 2018 09:02:37 +0100 Subject: [PATCH 4/7] Update Windows.bat --- CI/Windows.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/Windows.bat b/CI/Windows.bat index 13cead8f..1f91841e 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -72,6 +72,7 @@ IF "%APPS%" == "ON" ( dir REM Create the platform plugins subdirectory for the qt plugins required to run the gui apps + mkdir Build mkdir Build\plugins mkdir Build\plugins\platforms -- GitLab From 89a0d963d10a0acbd4869c132a17dd5e9464a44b Mon Sep 17 00:00:00 2001 From: Kersten Schuster Date: Tue, 30 Oct 2018 09:03:48 +0100 Subject: [PATCH 5/7] Update Windows.bat --- CI/Windows.bat | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index 1f91841e..ebb09c3b 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -69,12 +69,20 @@ IF "%APPS%" == "ON" ( ECHO "Copying Platform plugins from %QT_INSTALL_PATH%\plugins\platforms to Build\plugins\platforms" - dir + REM Create the platform plugins subdirectory for the qt plugins required to run the gui apps mkdir Build mkdir Build\plugins mkdir Build\plugins\platforms + + dir + + dir %QT_INSTALL_PATH% + + dir %QT_INSTALL_PATH%\plugins + + dir %QT_INSTALL_PATH%\plugins\platforms REM Copy the platform plugins subdirectory for the qt plugins required to run the gui apps xcopy /Y %QT_INSTALL_PATH%\plugins\platforms Build\plugins\platforms -- GitLab From 914612022faf3a47578bcdfe4f2fd0c299b5232b Mon Sep 17 00:00:00 2001 From: Kersten Schuster Date: Tue, 30 Oct 2018 09:22:48 +0100 Subject: [PATCH 6/7] Update Windows.bat --- CI/Windows.bat | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index ebb09c3b..f37de30e 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -76,14 +76,6 @@ IF "%APPS%" == "ON" ( mkdir Build\plugins mkdir Build\plugins\platforms - dir - - dir %QT_INSTALL_PATH% - - dir %QT_INSTALL_PATH%\plugins - - dir %QT_INSTALL_PATH%\plugins\platforms - REM Copy the platform plugins subdirectory for the qt plugins required to run the gui apps xcopy /Y %QT_INSTALL_PATH%\plugins\platforms Build\plugins\platforms set CMAKE_CONFIGURATION=%QT_BASE_CONFIG% -- GitLab From 62934cbd6e51065f605604a968b96d49377f0421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 30 Oct 2018 10:06:20 +0100 Subject: [PATCH 7/7] As we remove VS2012 support, we release as OpenMesh 8.0 --- CHANGELOG.md | 4 ++-- Doc/changelog.docu | 2 +- README.md | 2 +- VERSION | 6 +++--- cmake/FindOpenMesh.cmake | 2 ++ src/OpenMesh/Core/System/config.h | 3 ++- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bd7a588..c82c7864 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -Please look into the doxygen configuration (Generated from Doc/history.docu) +The changelog can be found in the html Documentation. The latest changelog for the master can be found here: -http://openmesh.org/Daily-Builds/Doc/a00002.html +http://openmesh.org/Daily-Builds/Doc/ diff --git a/Doc/changelog.docu b/Doc/changelog.docu index c38bd385..e977abfa 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -7,7 +7,7 @@ -7.2 (?/?/?) +8.0 (?/?/?) Core
    diff --git a/README.md b/README.md index f3a4d17f..0c8c38de 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenMesh, 7.2 +# OpenMesh, 8.0 [![](https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh/badges/master/pipeline.svg)](https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh/commits/master) diff --git a/VERSION b/VERSION index c975e25f..47e41527 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=7.2 -MAJOR=7 -MINOR=2 +VERSION=8.0 +MAJOR=8 +MINOR=0 PATCH=0 ID=OPENMESH diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index 19509deb..13213ad9 100644 --- a/cmake/FindOpenMesh.cmake +++ b/cmake/FindOpenMesh.cmake @@ -63,6 +63,7 @@ IF (NOT OPENMESH_FOUND) "${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh" + "C:/Program Files/OpenMesh 8.0" "C:/Program Files/OpenMesh 7.2" "C:/Program Files/OpenMesh 7.1" "C:/Program Files/OpenMesh 7.0" @@ -84,6 +85,7 @@ IF (NOT OPENMESH_FOUND) "C:/Program Files/OpenMesh 2.4.1" "C:/Program Files/OpenMesh 2.4" "C:/Program Files/OpenMesh 2.0/include" + "C:/libs/OpenMesh 8.0" "C:/libs/OpenMesh 7.1" "C:/libs/OpenMesh 7.0" "C:/libs/OpenMesh 6.3" diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index bb5a7893..4611fbfb 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -65,7 +65,8 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x70200 +#define OM_VERSION 0x80000 +//#define OM_VERSION 0x70200 #define OM_GET_VER ((OM_VERSION & 0xf0000) >> 16) #define OM_GET_MAJ ((OM_VERSION & 0x0ff00) >> 8) -- GitLab