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
OpenFlipper-Free
OpenFlipper-Free
Commits
eb8c1a1d
Commit
eb8c1a1d
authored
Feb 28, 2019
by
Jan Möbius
Browse files
Merge branch 'GLEW_internal' into 'master'
Glew internal See merge request
!336
parents
4c3f9542
cd7da828
Changes
7
Hide whitespace changes
Inline
Side-by-side
CI/ci-cppcheck.sh
View file @
eb8c1a1d
...
...
@@ -23,6 +23,7 @@ cppcheck --enable=all \
-j4
\
--quiet
\
-i
OpenFlipper/libs_required/OpenMesh
\
-i
OpenFlipper/libs_required/glew-cmake
\
-i
build-release
\
-i
build-debug
\
-i
.svn
\
...
...
CI/ci-mac-build.sh
View file @
eb8c1a1d
...
...
@@ -15,7 +15,7 @@ fi
cd
build-release
# Build without ports to avoid qt4 collision
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
-DGLEW_INCLUDE_DIR
=
/Users/jenkins/sw/glew-1.10.0-installed/include/
-DGLEW_LIBRARY
=
/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
make
-j2
...
...
CI/ci-mac-deploy.sh
View file @
eb8c1a1d
...
...
@@ -27,7 +27,7 @@ fi
# Build without ports to avoid qt4 collision
# fix pathes if run on a different machine
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
-DGLEW_INCLUDE_DIR
=
/Users/jenkins/sw/glew-1.10.0-installed/include/
-DGLEW_LIBRARY
=
/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
rm
-f
*
.dmg
...
...
CI/ci-mac-test.sh
View file @
eb8c1a1d
...
...
@@ -27,7 +27,7 @@ fi
# Build without ports to avoid qt4 collision
# run this prior testing to fix paths
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
-DGLEW_INCLUDE_DIR
=
/Users/jenkins/sw/glew-1.10.0-installed/include/
-DGLEW_LIBRARY
=
/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
/opt/local/bin/cmake ../
-DCMAKE_CXX_FLAGS
=
'-std=c++11'
-DQWT6_INCLUDE_DIR
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework/Headers
-DQWT6_LIBRARY
=
/Users/jenkins/sw/qwt-6.1.3-qt5.11.3/lib/qwt.framework
-DQT5_INSTALL_PATH
=
/Users/jenkins/sw/Qt/5.11.3/clang_64/
########################################
...
...
CI/ci-windows-config.bat
View file @
eb8c1a1d
...
...
@@ -74,20 +74,6 @@ for /l %%x in (6, 1, 7) do (
)
)
:: check for glew version 1.1 to 1.3 use the highest found version
for
/l
%%x
in
(
0
,
1
,
3
)
do
(
if
exist
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.1
%%x
.0\include
(
set
GLEW_INCLUDE_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.1
%%x
.0\include
set
GLEW_LIBRARY_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
1
.1
%%x
.0\lib\glew32.lib
)
)
:: check for glew version 2.0
if
exist
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
2
.0.0\include
(
set
GLEW_INCLUDE_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
2
.0.0\include
set
GLEW_LIBRARY_DIR
=
%LIBPATH_BASE%
\
%ARCHITECTURE%
\glew
-
2
.0.0\lib\glew32.lib
)
:: check for qwt version 6.1.1 to 6.1.3 use the highest found version
for
/l
%%x
in
(
0
,
1
,
3
)
do
(
if
exist
%LIBPATH_BASE%
\
%ARCHITECTURE%
\qwt
-
6
.1.
%%x
-qt
%QT_REV_LONG%
\include
(
...
...
@@ -104,4 +90,4 @@ for /l %%x in (0, 1, 3) do (
)
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DGLEW
_INCLUDE_DIR
=
"
%GLEW_INCLUDE_DIR%
"
-DGLEW
_LIBRARY
=
"
%GLEW_LIBRARY_DIR%
"
-DQWT
6
_INCLUDE_DIR
=
%QWT6
_INCLUDE_DIR
%
-DQWT
6
_LIBRARY
=
%QWT6
_LIBRARY
%
-DQWT
6
_LIBRARY_DIR
=
%QWT6
_LIBRARY_DIR
%
-DCMAKE
_WINDOWS_LIBS_DIR
=
%CMAKE_WINDOWS_LIBS_DIR%
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DQWT
6
_INCLUDE_DIR
=
%QWT6
_INCLUDE_DIR
%
-DQWT
6
_LIBRARY
=
%QWT6
_LIBRARY
%
-DQWT
6
_LIBRARY_DIR
=
%QWT6
_LIBRARY_DIR
%
-DCMAKE
_WINDOWS_LIBS_DIR
=
%CMAKE_WINDOWS_LIBS_DIR%
CMakeLists.txt
View file @
eb8c1a1d
...
...
@@ -208,11 +208,6 @@ if (NOT OPENGL_FOUND)
message
(
FATAL_ERROR
"OpengGL not found!"
)
endif
()
find_package
(
GLEW
)
if
(
NOT GLEW_FOUND
)
message
(
FATAL_ERROR
"GLEW not found!"
)
endif
()
# using the internal openmesh delivered by the svn repo (default) or use some external installation
set
(
USE_INTERNAL_OPENMESH ON CACHE BOOL
"Use and build internal version of OpenMesh found in libs_required"
)
...
...
@@ -249,6 +244,7 @@ enable_testing()
# Build all additional libraries
# ========================================================================
add_subdirectory
(
OpenFlipper/libs_required/glew-cmake
)
add_subdirectory
(
OpenFlipper/libs_required/OpenMesh
)
add_subdirectory
(
OpenFlipper/libs_required/ACG
)
...
...
OpenFlipper
@
a323631a
Subproject commit a
646058354be739584311b127fa2daeb896eccc6
Subproject commit a
323631abc7ceacc32ceec7cb56a2355151e9cdb
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