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

CMake changes for default module selections and webbrowser linux

Browse Source
This commit is contained in:
Gene Payne
2022-04-21 15:14:25 -06:00
parent 3859c6003c
commit 90b22f9af4
3 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/cefwebgui/include.cmake
View File

@@ -1,9 +1,4 @@
if (APPLE OR WIN32)
set(DEFAULT_MODULE ON)
else ()
# CefWebGui is not available on Linux
set(DEFAULT_MODULE OFF)
endif ()
set(DEFAULT_MODULE ON)
set(OPENSPACE_DEPENDENCIES
webbrowser

46
modules/webbrowser/CMakeLists.txt
View File

@@ -70,8 +70,8 @@ if (WIN32)
option(USE_SANDBOX OFF)
endif ()
if (LINUX)
option(USE_SANDBOX OFF)
if (OS_LINUX)
set(USE_SANDBOX OFF)
endif ()
# Add this project's cmake/ directory to the module path.
@@ -194,35 +194,23 @@ 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_property(TARGET ${CEF_HELPER_TARGET_GPU} PROPERTY FOLDER "Helper")
set_property(TARGET ${CEF_HELPER_TARGET_RENDERER} PROPERTY FOLDER "Helper")
else()
message(STATUS "Setting up WebBrowser CEF helper executable: ${CEF_HELPER_TARGET}")
set_openspace_cef_target_out_dir()
add_executable(${CEF_HELPER_TARGET} ${WEBBROWSER_HELPER_SOURCES})
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET})
add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper)
# Logical target used to link the libcef library.
add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
if (OS_WINDOWS)
# Add the custom manifest files to the executable.
add_windows_cef_manifest("${CEF_TARGET_OUT_DIR}" "${WEBBROWSER_MODULE_PATH}" "${CEF_HELPER_TARGET}" "exe")
endif (OS_WINDOWS)
endif ()
if (OS_WINDOWS)
message(STATUS "Setting up WebBrowser CEF helper executable: ${CEF_HELPER_TARGET}")
set_openspace_cef_target_out_dir()
add_executable(${CEF_HELPER_TARGET} ${WEBBROWSER_HELPER_SOURCES})
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET})
add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper)
# Logical target used to link the libcef library.
add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
# Add the custom manifest files to the executable.
add_windows_cef_manifest("${CEF_TARGET_OUT_DIR}" "${WEBBROWSER_MODULE_PATH}" "${CEF_HELPER_TARGET}" "exe")
endif (OS_WINDOWS)
if (OS_LINUX)
message(STATUS "Setting up WebBrowser CEF helper executable: ${CEF_HELPER_TARGET}")
set_openspace_cef_target_out_dir()
add_executable(${CEF_HELPER_TARGET} ${WEBBROWSER_HELPER_SOURCES})
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET})
add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper)
# Logical target used to link the libcef library.
add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
endif (OS_LINUX)
set_property(TARGET ${CEF_HELPER_TARGET} PROPERTY FOLDER "Helper")
##########################################################################################

7
modules/webbrowser/include.cmake
View File

@@ -1,6 +1 @@
if (APPLE OR WIN32)
set(DEFAULT_MODULE ON)
else ()
# WebBrowser is not available on Linux
set(DEFAULT_MODULE OFF)
endif ()
set(DEFAULT_MODULE ON)