Skip to content

Commit 99fa6d0

Browse files
uwewoessneruwewoessner
authored
Merge branch 'master' into geodata-library
2 parents c9b747f + a1d64de commit 99fa6d0

9 files changed

Lines changed: 3202 additions & 3175 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,12 @@ if (NOT COVISE_BUILD_ONLY_FILE)
339339
covise_find_package(Freetype)
340340
covise_find_package(CURL)
341341
if (NOT COVISE_BUILD_ONLY_ODDLOT AND NOT COVISE_BUILD_ONLY_COVER)
342-
covise_find_package(glslang 15 CONFIG)
342+
foreach(v 20 19 18 17 16 15)
343+
covise_find_package(glslang ${v} CONFIG QUIET)
344+
if (TARGET glslang::glslang)
345+
break()
346+
endif()
347+
endforeach()
343348
covise_find_package(Vulkan 1.1.70)
344349
covise_find_package(vsg 1.1.4 CONFIG)
345350
covise_find_package(vsgXchange 1.0.5 CONFIG)

‎cmake/FindGeoTIFF.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ find_path(GEOTIFF_INCLUDE_DIR geotiff.h
1414
/sw/include
1515
/usr/include/libgeotiff
1616
/opt/local/include
17+
PATH_SUFFIXES geotiff
1718
DOC "The directory where geotiff.h resides")
1819

1920
find_library(GEOTIFF_LIBRARY NAMES geotiff geotiff_i

‎cmake/Qt5-6.cmake‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ macro(find_qt)
1111
set(required "REQUIRED")
1212
endif()
1313
if(NOT COVISE_USE_QT5)
14-
covise_find_package(Qt6 QUIET COMPONENTS Core OPTIONAL_COMPONENTS WebEngineWidgets)
15-
covise_find_package(Qt6 QUIET COMPONENTS Core OPTIONAL_COMPONENTS WebView)
16-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS Quick)
17-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS Svg)
18-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS SvgWidgets)
19-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS OpenGL)
20-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS OpenGLWidgets)
21-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS PrintSupport)
22-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS Location)
23-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS Positioning)
24-
covise_find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS UiTools)
25-
covise_find_package(Qt6 QUIET COMPONENTS Core Gui Xml Network OpenGLWidgets ${required} OPTIONAL_COMPONENTS WebEngineWidgets WebView Quick Svg SvgWidgets OpenGL PrintSupport UiTools Location Positioning)
14+
covise_find_package(Qt6 CONFIG QUIET COMPONENTS Core OPTIONAL_COMPONENTS WebEngineWidgets)
15+
covise_find_package(Qt6 CONFIG QUIET COMPONENTS Core OPTIONAL_COMPONENTS WebView)
16+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS Quick)
17+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS Svg)
18+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS SvgWidgets)
19+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS OpenGL)
20+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS OpenGLWidgets)
21+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS PrintSupport)
22+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS Location)
23+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS Positioning)
24+
covise_find_package(Qt6 CONFIG COMPONENTS Core OPTIONAL_COMPONENTS UiTools)
25+
covise_find_package(Qt6 CONFIG QUIET COMPONENTS Core Gui Xml Network OpenGLWidgets ${required} OPTIONAL_COMPONENTS WebEngineWidgets WebView Quick Svg SvgWidgets OpenGL PrintSupport UiTools Location Positioning)
2626

2727
if (Qt6WebEngineWidgets_FOUND)
2828
set(COVISE_USE_WEBENGINE TRUE)
@@ -34,48 +34,48 @@ macro(find_qt)
3434
GETENV_PATH(EXTERNLIBSQT EXTERNLIBS)
3535
STRING(REPLACE "/" \\ USING_FILES "${USING_FILES}")
3636
set(CMAKE_PREFIX_PATH ${EXTERNLIBSQT}/qt5 ${CMAKE_PREFIX_PATH})
37-
covise_find_package(Qt5 COMPONENTS Core ${required})
38-
covise_find_package(Qt5 COMPONENTS Core Network ${required})
39-
covise_find_package(Qt5 COMPONENTS Core Xml ${required})
40-
covise_find_package(Qt5 COMPONENTS Core Widgets ${required})
41-
covise_find_package(Qt5 COMPONENTS Core OpenGL ${required})
42-
covise_find_package(Qt5 COMPONENTS Core Gui ${required})
43-
covise_find_package(Qt5 COMPONENTS Core Svg ${required})
44-
covise_find_package(Qt5 COMPONENTS Core PrintSupport ${required})
45-
covise_find_package(Qt5 COMPONENTS Core UiTools ${required})
46-
covise_find_package(Qt5 COMPONENTS Core WebEngine QUIET)
47-
covise_find_package(Qt5 COMPONENTS Core WebEngineWidgets QUIET)
37+
covise_find_package(Qt5 CONFIG COMPONENTS Core ${required})
38+
covise_find_package(Qt5 CONFIG COMPONENTS Core Network ${required})
39+
covise_find_package(Qt5 CONFIG COMPONENTS Core Xml ${required})
40+
covise_find_package(Qt5 CONFIG COMPONENTS Core Widgets ${required})
41+
covise_find_package(Qt5 CONFIG COMPONENTS Core OpenGL ${required})
42+
covise_find_package(Qt5 CONFIG COMPONENTS Core Gui ${required})
43+
covise_find_package(Qt5 CONFIG COMPONENTS Core Svg ${required})
44+
covise_find_package(Qt5 CONFIG COMPONENTS Core PrintSupport ${required})
45+
covise_find_package(Qt5 CONFIG COMPONENTS Core UiTools ${required})
46+
covise_find_package(Qt5 CONFIG COMPONENTS Core WebEngine QUIET)
47+
covise_find_package(Qt5 CONFIG COMPONENTS Core WebEngineWidgets QUIET)
4848
if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
4949
set(COVISE_USE_WEBENGINE TRUE)
5050
else()
51-
covise_find_package(Qt5 COMPONENTS Core WebKit QUIET)
52-
covise_find_package(Qt5 COMPONENTS Core WebKitWidgets QUIET)
51+
covise_find_package(Qt5 CONFIG COMPONENTS Core WebKit QUIET)
52+
covise_find_package(Qt5 CONFIG COMPONENTS Core WebKitWidgets QUIET)
5353
if (Qt5WebKit_FOUND AND Qt5WebKitWidgets_FOUND)
5454
set(COVISE_USE_WEBKIT TRUE)
5555
endif()
5656
endif()
57-
covise_find_package(Qt5 COMPONENTS Core Quick QUIET)
57+
covise_find_package(Qt5 CONFIG COMPONENTS Core Quick QUIET)
5858
if (Qt5Quick_FOUND)
5959
add_definitions(-DHAVE_QT_QUICK)
6060
endif()
61-
covise_find_package(Qt5 COMPONENTS Core Location QUIET)
61+
covise_find_package(Qt5 CONFIG COMPONENTS Core Location QUIET)
6262
if (Qt5Location_FOUND)
6363
add_definitions(-DHAVE_QT_LOCATION)
6464
endif()
65-
covise_find_package(Qt5 COMPONENTS Core Positioning QUIET)
65+
covise_find_package(Qt5 CONFIG COMPONENTS Core Positioning QUIET)
6666
if (Qt5Positioning_FOUND)
6767
add_definitions(-DHAVE_QT_POSITIONING)
6868
endif()
69-
covise_find_package(Qt5 COMPONENTS Core Multimedia QUIET)
69+
covise_find_package(Qt5 CONFIG COMPONENTS Core Multimedia QUIET)
7070
if (Qt5Multimedia_FOUND)
7171
add_definitions(-DHAVE_QT_MULTIMEDIA)
7272
endif()
73-
covise_find_package(Qt5 COMPONENTS Core Script QUIET)
74-
covise_find_package(Qt5 COMPONENTS Core ScriptTools QUIET)
73+
covise_find_package(Qt5 CONFIG COMPONENTS Core Script QUIET)
74+
covise_find_package(Qt5 CONFIG COMPONENTS Core ScriptTools QUIET)
7575
if (Qt5Script_FOUND AND Qt5ScriptTools_FOUND)
7676
add_definitions(-DHAVE_QT_SCRIPT)
7777
endif()
78-
covise_find_package(Qt5 COMPONENTS Core X11Extras QUIET)
78+
covise_find_package(Qt5 CONFIG COMPONENTS Core X11Extras QUIET)
7979
if (Qt5X11Extras_FOUND)
8080
set(-DHAVE_QT_X11EXTRAS)
8181
endif()

‎cmake/Using/UseIFCPP.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MACRO(USE_IFCPP)
2-
covise_find_package(IFCPP)
2+
covise_find_package(IFCPP CONFIG)
33
IF ((NOT IFCPP_FOUND) AND (${ARGC} LESS 1))
44
USING_MESSAGE("Skipping because of missing IFCPP")
55
RETURN()

‎src/OpenCOVER/plugins/general/GLTF/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ SET(SOURCES
1313

1414
cover_add_plugin(GLTF ${HEADERS})
1515
COVISE_WNOERROR(GLTF)
16+
target_link_libraries(GLTF stb::stb)

‎src/OpenCOVER/plugins/general/GLTF/GLTFPlugin.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
#include <osgUtil/SmoothingVisitor>
6363

6464
#include <osgUtil/Optimizer>
65+
66+
#define TINYGLTF_NO_INCLUDE_STB_IMAGE
67+
#include <stb_image.h>
68+
6569
#include "GLTFPlugin.h"
6670

6771
#define TINYGLTF_IMPLEMENTATION

‎src/OpenCOVER/plugins/general/GLTF/GLTFPlugin.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ using namespace opencover;
3232
#include <osgDB/FileNameUtils>
3333
#include <osgDB/Registry>
3434

35+
#ifndef TINYGLTF_ENABLE_DRACO
3536
#define TINYGLTF_ENABLE_DRACO
37+
#endif
3638
#include "tiny_gltf.h"
3739

3840
class PLUGINEXPORT GLTFPlugin : public coVRPlugin

0 commit comments

Comments
 (0)