Feature/cef cmake (#873)

* Expose `CMAKE_BUILD_TYPE` to cmake gui (for single configuration generators) * Use generator expressions to get debug vs release mode * Fix mac app icon
2026-02-25 06:19:02 -06:00 · 2019-05-18 22:50:00 +02:00
parent 916cc1d76d
commit d0e9170658
10 changed files with 8 additions and 14 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,7 +256,7 @@ message(STATUS "")
 # target as of July 2017, which is needed.
 if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  # wanted by CEF
-  set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE")
+  set(CMAKE_BUILD_TYPE Debug CACHE STRING "CMAKE_BUILD_TYPE")

  set(PROJECT_ARCH "x86_64")

--- a/apps/OpenSpace-MinVR/CMakeLists.txt
+++ b/apps/OpenSpace-MinVR/CMakeLists.txt
@@ -56,9 +56,6 @@ target_link_libraries(OpenSpace-MinVR libOpenSpace MinVR)
 # Why not put these in the module's path? Because they do not have access to the
 # target as of July 2017, which is needed.
 if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
-  # wanted by CEF
-  set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE")
-
  if (WIN32)
    set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace-MinVR/openspace.rc)
  endif ()
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -152,7 +152,6 @@ end_header("Dependency: SGCT")
 # target as of July 2017, which is needed.
 if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  # wanted by CEF
-  set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE")
  set(PROJECT_ARCH "x86_64")

  if (WIN32)
--- a/apps/Sync/CMakeLists.txt
+++ b/apps/Sync/CMakeLists.txt
@@ -44,7 +44,7 @@ target_link_libraries(Sync openspace-core)
 # target as of July 2017, which is needed.
 if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  # wanted by CEF
-  set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE")
+  set(CMAKE_BUILD_TYPE Debug CACHE STRING "CMAKE_BUILD_TYPE")

  if (WIN32)
    set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc)
--- a/apps/TaskRunner/CMakeLists.txt
+++ b/apps/TaskRunner/CMakeLists.txt
@@ -44,7 +44,7 @@ target_link_libraries(TaskRunner openspace-core)
 # target as of July 2017, which is needed.
 if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  # wanted by CEF
-  set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE")
+  set(CMAKE_BUILD_TYPE Debug CACHE STRING "CMAKE_BUILD_TYPE")

  if (WIN32)
    set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc)
--- a/apps/Wormhole/CMakeLists.txt
+++ b/apps/Wormhole/CMakeLists.txt
@@ -45,7 +45,7 @@ target_link_libraries(Wormhole openspace-core)
 # target as of July 2017, which is needed.
 if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  # wanted by CEF
-  set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE")
+  set(CMAKE_BUILD_TYPE Debug CACHE STRING "CMAKE_BUILD_TYPE")
  set(PROJECT_ARCH "x86_64")

  if (WIN32)
--- a/modules/webbrowser/CMakeLists.txt
+++ b/modules/webbrowser/CMakeLists.txt
@@ -32,7 +32,6 @@ set(WEBBROWSER_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "WEBBROWSE

 # wanted by CEF
 set(PROJECT_ARCH "x86_64")
-set(CMAKE_BUILD_TYPE Debug)

 ##########################################################################################
 # Download CEF
@@ -131,7 +130,6 @@ APPEND_PLATFORM_SOURCES(WEBBROWSER_HELPER_SOURCES)

 set(WEBBROWSER_RESOURCES_MAC_SOURCES_MACOSX
  mac/Info.plist
-  mac/webgui.icns
 )
 APPEND_PLATFORM_SOURCES(WEBBROWSER_RESOURCES_MAC_SOURCES)

--- a/modules/webbrowser/cmake/cef_support.cmake
+++ b/modules/webbrowser/cmake/cef_support.cmake
@@ -106,7 +106,7 @@ macro(set_openspace_cef_target_out_dir)
    # set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
  else()
    # set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
-    set(CEF_TARGET_OUT_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>")
+    set(CEF_TARGET_OUT_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>")
  endif()
 endmacro()

--- a/modules/webbrowser/cmake/webbrowser_helpers.cmake
+++ b/modules/webbrowser/cmake/webbrowser_helpers.cmake
@@ -62,7 +62,7 @@ function(run_cef_platform_config cef_root cef_target module_path)
 endfunction()

 function(run_cef_macosx_config CEF_ROOT module_path)
-    set(CEF_FINAL_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/${CEF_TARGET}.app")
+    set(CEF_FINAL_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${CEF_TARGET}.app")
    set(CEF_FINAL_HELPER_APP "${CEF_FINAL_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app")
    set(CEF_FRAMEWORK_LOCATION "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework")
    set(CEF_FRAMEWORK_FINAL_LOCATION "${CEF_FINAL_APP}/Contents/Frameworks/Chromium Embedded Framework.framework")
@@ -80,7 +80,7 @@ function(run_cef_macosx_config CEF_ROOT module_path)
        TARGET ${CEF_TARGET}
        POST_BUILD
        # Copy the helper app bundle into the Frameworks directory.
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug${CEF_HELPER_APP}" "${CEF_FINAL_HELPER_APP}"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${CEF_HELPER_APP}" "${CEF_FINAL_HELPER_APP}"
        # Copy the CEF framework into the Frameworks directory.
        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CEF_FRAMEWORK_LOCATION}" "${CEF_FRAMEWORK_FINAL_LOCATION}"
        VERBATIM
--- a/modules/webbrowser/mac/Info.plist
+++ b/modules/webbrowser/mac/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string>webgui.icns</string>
+	<string>openspace.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.openspaceproject.openspace</string>
 	<key>CFBundleInfoDictionaryVersion</key>