mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 05:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with unix makefiles on mac. (#875)

Browse Source
This commit is contained in:
Emil Axelsson
2019-05-19 02:16:44 +02:00
committed by GitHub
parent 0bb6b9d0e5
commit 4ec1f9ba1f
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/webbrowser/CMakeLists.txt
-3
View File
@@ -153,9 +153,6 @@ set(CEF_HELPER_TARGET "OpenSpace Helper" CACHE INTERNAL "CEF_HELPER_TARGET")
#
if(OS_MACOSX)
# set global CEF helper app target
set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_TARGET}.app" CACHE INTERNAL "CEF_HELPER_APP")
# Helper executable target.
add_executable(${CEF_HELPER_TARGET} MACOSX_BUNDLE ${WEBBROWSER_HELPER_SOURCES})
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET})
modules/webbrowser/cmake/patch/cmake/cef_variables.cmake
+9 -2
View File
@@ -319,7 +319,14 @@ if(OS_MACOSX)
endif()
# CEF directory paths.
set(CEF_BINARY_DIR "${_CEF_ROOT}/$<CONFIGURATION>")
if (${CMAKE_GENERATOR} STREQUAL "Ninja" OR
${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
set(CEF_BINARY_DIR "${_CEF_ROOT}/${CMAKE_BUILD_TYPE}")
else()
set(CEF_BINARY_DIR "${_CEF_ROOT}/$<CONFIG>")
endif()
set(CEF_BINARY_DIR_DEBUG "${_CEF_ROOT}/Debug")
set(CEF_BINARY_DIR_RELEASE "${_CEF_ROOT}/Release")
@@ -438,7 +445,7 @@ if(OS_WINDOWS)
# CEF directory paths.
set(CEF_RESOURCE_DIR "${_CEF_ROOT}/Resources")
set(CEF_BINARY_DIR "${_CEF_ROOT}/$<CONFIGURATION>")
set(CEF_BINARY_DIR "${_CEF_ROOT}/$<CONFIG>")
set(CEF_BINARY_DIR_DEBUG "${_CEF_ROOT}/Debug")
set(CEF_BINARY_DIR_RELEASE "${_CEF_ROOT}/Release")
modules/webbrowser/cmake/webbrowser_helpers.cmake
+11 -2
View File
@@ -62,7 +62,16 @@ 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}/$<CONFIG>/${CEF_TARGET}.app")
if (${CMAKE_GENERATOR} STREQUAL "Ninja" OR
${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
set(CEF_OUTPUT_PREFIX "")
else()
set(CEF_OUTPUT_PREFIX "$<CONFIG>/")
endif()
set(CEF_FINAL_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CEF_OUTPUT_PREFIX}${CEF_TARGET}.app")
set(CEF_INTERMEDIATE_HELPER_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CEF_OUTPUT_PREFIX}${CEF_HELPER_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 +89,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}/$<CONFIG>/${CEF_HELPER_APP}" "${CEF_FINAL_HELPER_APP}"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CEF_INTERMEDIATE_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