Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenMesh
OpenMesh
Commits
54d782fa
Commit
54d782fa
authored
Oct 30, 2018
by
Jan Möbius
Browse files
Merge branch 'ci_tests' into 'master'
Add checks for Qt5 install path and libdir See merge request
!186
parents
8c6cb2b6
62934cbd
Changes
7
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
54d782fa
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/
CI/Windows.bat
View file @
54d782fa
...
...
@@ -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
-vs
2012
-
%STRING_ARCH%
\
set
QT_BASE_CONFIG
=
-DQT
_QMAKE_EXECUTABLE
=
E
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\bin\qmake.exe
)
IF
"
%ARCHITECTURE%
"
==
"x32"
(
set
QT_INSTALL_PATH
=
E
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\
set
QT_BASE_CONFIG
=
-DQT
_QMAKE_EXECUTABLE
=
E
:\Qt\4.8.5
-vs
2012
-
%STRING_ARCH%
\bin\qmake.exe
)
)
IF
"
%BUILD_PLATFORM%
"
==
"VS2013"
(
set
LIBPATH
=
E
:\libs\VS2013
set
GTESTVERSION
=
gtest
-
1
.6.0
...
...
@@ -83,10 +67,15 @@ 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
mkdir
Build
\plugins
mkdir
Build
\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%
...
...
@@ -95,6 +84,9 @@ IF "%APPS%" == "ON" (
set
CMAKE_CONFIGURATION
=
)
ECHO
"============================================================="
ECHO
"============================================================="
ECHO
"Building with :"
...
...
@@ -111,7 +103,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:
%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%
..
...
...
Doc/changelog.docu
View file @
54d782fa
...
...
@@ -7,7 +7,7 @@
<!-- --------------------------------------------------------------------- -->
<tr valign=top><td><b>
7.2
</b> (?/?/?)</td><td>
<tr valign=top><td><b>
8.0
</b> (?/?/?)</td><td>
<b>Core</b>
<ul>
...
...
README.md
View file @
54d782fa
# OpenMesh,
7.2
# OpenMesh,
8.0
[

](https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh/commits/master)
...
...
VERSION
View file @
54d782fa
VERSION=
7.2
MAJOR=
7
MINOR=
2
VERSION=
8.0
MAJOR=
8
MINOR=
0
PATCH=0
ID=OPENMESH
cmake/FindOpenMesh.cmake
View file @
54d782fa
...
...
@@ -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"
...
...
src/OpenMesh/Core/System/config.h
View file @
54d782fa
...
...
@@ -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)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment