Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
11
Issues
11
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
OpenMesh
Commits
2bbbcc68
Commit
2bbbcc68
authored
May 23, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Qt5 files from OpenFlipper
parent
2b49ddfa
Pipeline
#7010
failed with stage
in 61 minutes and 4 seconds
Changes
4
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
417 additions
and
408 deletions
+417
-408
CI/Windows.bat
CI/Windows.bat
+0
-4
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/ACGCommon.cmake
cmake/ACGCommon.cmake
+20
-404
cmake/ACGQt.cmake
cmake/ACGQt.cmake
+396
-0
No files found.
CI/Windows.bat
View file @
2bbbcc68
...
...
@@ -21,7 +21,6 @@ IF "%BUILD_PLATFORM%" == "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"
set
QT_VERSION
=
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
...
...
@@ -38,7 +37,6 @@ IF "%BUILD_PLATFORM%" == "VS2013" (
set
GTESTVERSION
=
gtest
-
1
.6.0
set
GENERATOR
=
Visual
Studio
12
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com"
set
QT_VERSION
=
IF
"
%ARCHITECTURE%
"
==
"x64"
(
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_64_opengl
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.3.1
-vs
2013
-
%STRING_ARCH%
\5.3\msvc2013_64_opengl
...
...
@@ -56,7 +54,6 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
set
GENERATOR
=
Visual
Studio
14
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
set
QT_VERSION
=
IF
"
%ARCHITECTURE%
"
==
"x64"
(
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015_64
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.6.0
-vs
2015
-
%STRING_ARCH%
\5.6\msvc2015_64
...
...
@@ -75,7 +72,6 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
set
GENERATOR
=
Visual
Studio
15
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com"
set
QT_VERSION
=
IF
"
%ARCHITECTURE%
"
==
"x64"
(
set
QT_INSTALL_PATH
=
E
:\Qt\Qt5.10.1\5.10.1\msvc2017_64
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
E
:\Qt\Qt5.10.1\5.10.1\msvc2017_64
...
...
CMakeLists.txt
View file @
2bbbcc68
...
...
@@ -41,6 +41,7 @@ if(${PROJECT_NAME} MATCHES "OpenMesh")
endif
()
include
(
ACGOutput
)
include
(
ACGQt
)
# ========================================================================
# Definitions
...
...
cmake/ACGCommon.cmake
View file @
2bbbcc68
This diff is collapsed.
Click to expand it.
cmake/ACGQt.cmake
0 → 100644
View file @
2bbbcc68
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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