mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/grid-labels

Browse Source
This commit is contained in:
Malin E
2022-09-28 10:51:11 +02:00
parent 71a2cf685a eded668b95
commit 7883311740
16 changed files with 76 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/globebrowsing/CMakeLists.txt
View File

@@ -149,9 +149,11 @@ target_precompile_headers(${globebrowsing_module} PRIVATE
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gdal_data DESTINATION modules/globebrowsing)
if (WIN32)
target_include_directories(openspace-module-globebrowsing SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/include)
target_link_libraries(openspace-module-globebrowsing PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal_i.lib)
register_external_libraries("${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal241.dll")
add_library(gdal SHARED IMPORTED)
target_include_directories(gdal SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/include)
set_target_properties(gdal PROPERTIES IMPORTED_IMPLIB ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal_i.lib)
set_target_properties(gdal PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal241.dll)
target_link_libraries(openspace-module-globebrowsing PRIVATE gdal)
else (WIN32)
find_package(GDAL REQUIRED)

4
modules/space/rendering/renderableorbitalkepler.cpp
View File

@@ -160,7 +160,7 @@ RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
addProperty(_opacity);
_segmentQuality = static_cast<unsigned int>(p.segmentQuality);
_segmentQuality.onChange([this]() { initializeGL(); });
_segmentQuality.onChange([this]() { updateBuffers(); });
addProperty(_segmentQuality);
_appearance.lineColor = p.color;
@@ -169,7 +169,7 @@ RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
addPropertySubOwner(_appearance);
_path = p.path.string();
_path.onChange([this]() { initializeGL(); });
_path.onChange([this]() { updateBuffers(); });
addProperty(_path);
_format = codegen::map<kepler::Format>(p.format);

11
modules/spout/CMakeLists.txt
View File

@@ -50,8 +50,13 @@ create_new_module(
${HEADER_FILES} ${SOURCE_FILES}
)
target_include_directories(openspace-module-spout SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout)
target_link_libraries(openspace-module-spout PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.lib)
register_external_libraries("${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.dll")
add_library(spout SHARED IMPORTED)
target_include_directories(spout SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout)
set_target_properties(
spout PROPERTIES
IMPORTED_IMPLIB ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.lib
IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.dll
)
target_link_libraries(openspace-module-spout PRIVATE spout)
target_compile_definitions(openspace-module-spout PUBLIC "OPENSPACE_HAS_SPOUT")

17
modules/webbrowser/CMakeLists.txt
View File

@@ -202,8 +202,8 @@ if (OS_MACOSX)
endif ()
endforeach()
set_property(TARGET ${CEF_HELPER_TARGET_GPU} PROPERTY FOLDER "Helper")
set_property(TARGET ${CEF_HELPER_TARGET_RENDERER} PROPERTY FOLDER "Helper")
set_target_properties(${CEF_HELPER_TARGET_GPU} PROPERTIES FOLDER "Helper")
set_target_properties(${CEF_HELPER_TARGET_RENDERER} PROPERTIES FOLDER "Helper")
else()
message(STATUS "Setting up WebBrowser CEF helper executable: ${CEF_HELPER_TARGET}")
set_openspace_cef_target_out_dir()
@@ -219,7 +219,7 @@ else()
endif (OS_WINDOWS)
endif ()
set_property(TARGET ${CEF_HELPER_TARGET} PROPERTY FOLDER "Helper")
set_target_properties(${CEF_HELPER_TARGET} PROPERTIES FOLDER "Helper")
##########################################################################################
# Create OpenSpace module.
@@ -292,13 +292,4 @@ if (UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
DESTINATION ${CEF_ROOT}/${CMAKE_BUILD_TYPE}/
FILES_MATCHING PATTERN *
)
endif ()
# Rename to "OpenSpace Helper" after build & link as spaces in targets are not allowed
# add_custom_command(
# TARGET ${CEF_HELPER_TARGET} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E rename
# "$<TARGET_FILE_DIR:${CEF_HELPER_TARGET}>/${CEF_HELPER_TARGET}"
# "$<TARGET_FILE_DIR:${CEF_HELPER_TARGET}>/OpenSpace Helper"
# COMMENT "Renaming ${CEF_HELPER_TARGET} to 'OpenSpace Helper'"
# )
endif ()