mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-03 01:09:34 -05:00
CMake cleanup (#2489)
* CMake Cleanup * Warning suppression with CEF * Use SGCT tinyxml in skybrowser for now * Disable warnings about missing field initializers
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #
|
||||
##########################################################################################
|
||||
|
||||
include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
|
||||
include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
|
||||
|
||||
set(HEADER_FILES
|
||||
globebrowsingmodule.h
|
||||
|
||||
@@ -146,7 +146,7 @@ namespace {
|
||||
std::fill(IdentifierBuffer.begin(), IdentifierBuffer.end(), '\0');
|
||||
int ret = sscanf(
|
||||
subDatasets[i],
|
||||
"SUBDATASET_%i_%256[^=]",
|
||||
"SUBDATASET_%i_%255[^=]",
|
||||
&iDataset,
|
||||
IdentifierBuffer.data()
|
||||
);
|
||||
|
||||
@@ -145,7 +145,7 @@ std::array<LayerGroup*, LayerManager::NumLayerGroups> LayerManager::layerGroups(
|
||||
ZoneScoped
|
||||
|
||||
std::array<LayerGroup*, NumLayerGroups> res = {};
|
||||
for (int i = 0; i < NumLayerGroups; ++i) {
|
||||
for (size_t i = 0; i < NumLayerGroups; ++i) {
|
||||
res[i] = _layerGroups[i].get();
|
||||
}
|
||||
return res;
|
||||
|
||||
@@ -1713,7 +1713,7 @@ void RenderableGlobe::recompileShaders() {
|
||||
}
|
||||
|
||||
ghoul::Dictionary layerGroupNames;
|
||||
for (int i = 0; i < layers::Groups.size(); ++i) {
|
||||
for (size_t i = 0; i < layers::Groups.size(); ++i) {
|
||||
layerGroupNames.setValue(
|
||||
std::to_string(i),
|
||||
std::string(layers::Groups[i].identifier)
|
||||
|
||||
Reference in New Issue
Block a user