bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS: cmake: Don't create target name with spaces (issue #2342)

This commit is contained in:
Marshall Greenblatt 2018-01-03 15:03:15 -05:00
parent 6e457d6bb1
commit 0cd8169125
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cefclient/CMakeLists.txt.in
View File

@ -95,7 +95,8 @@
# Target executable names. # Target executable names.
set(CEF_TARGET "cefclient") set(CEF_TARGET "cefclient")
if(OS_MACOSX) if(OS_MACOSX)
set(CEF_HELPER_TARGET "cefclient Helper") set(CEF_HELPER_TARGET "cefclient_Helper")
set(CEF_HELPER_OUTPUT_NAME "cefclient Helper")
endif() endif()
# Logical target used to link the libcef library. # Logical target used to link the libcef library.
@ -170,7 +171,7 @@ if(OS_MACOSX)
# Output paths for the app bundles. # Output paths for the app bundles.
set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app") set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app")
set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_TARGET}.app") set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_OUTPUT_NAME}.app")
# Variable referenced from Info.plist files. # Variable referenced from Info.plist files.
set(PRODUCT_NAME "${CEF_TARGET}") set(PRODUCT_NAME "${CEF_TARGET}")
@ -182,6 +183,7 @@ if(OS_MACOSX)
target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS}) target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
set_target_properties(${CEF_HELPER_TARGET} PROPERTIES set_target_properties(${CEF_HELPER_TARGET} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/helper-Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/helper-Info.plist
OUTPUT_NAME ${CEF_HELPER_OUTPUT_NAME}
) )
# Fix the framework rpath in the helper executable. # Fix the framework rpath in the helper executable.
@ -203,7 +205,7 @@ if(OS_MACOSX)
# Copy the helper app bundle into the Frameworks directory. # Copy the helper app bundle into the Frameworks directory.
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CEF_HELPER_APP}" "${CEF_HELPER_APP}"
"${CEF_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app" "${CEF_APP}/Contents/Frameworks/${CEF_HELPER_OUTPUT_NAME}.app"
# Copy the CEF framework into the Frameworks directory. # Copy the CEF framework into the Frameworks directory.
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CEF_BINARY_DIR}/Chromium Embedded Framework.framework" "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework"

8
tests/cefsimple/CMakeLists.txt.in
View File

@ -43,7 +43,8 @@
# Target executable names. # Target executable names.
set(CEF_TARGET "cefsimple") set(CEF_TARGET "cefsimple")
if(OS_MACOSX) if(OS_MACOSX)
set(CEF_HELPER_TARGET "cefsimple Helper") set(CEF_HELPER_TARGET "cefsimple_Helper")
set(CEF_HELPER_OUTPUT_NAME "cefsimple Helper")
endif() endif()
# Logical target used to link the libcef library. # Logical target used to link the libcef library.
@ -85,7 +86,7 @@ endif()
if(OS_MACOSX) if(OS_MACOSX)
# Output paths for the app bundles. # Output paths for the app bundles.
set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app") set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app")
set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_TARGET}.app") set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_OUTPUT_NAME}.app")
# Variable referenced from Info.plist files. # Variable referenced from Info.plist files.
set(PRODUCT_NAME "${CEF_TARGET}") set(PRODUCT_NAME "${CEF_TARGET}")
@ -97,6 +98,7 @@ if(OS_MACOSX)
target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS}) target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
set_target_properties(${CEF_HELPER_TARGET} PROPERTIES set_target_properties(${CEF_HELPER_TARGET} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/helper-Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/helper-Info.plist
OUTPUT_NAME ${CEF_HELPER_OUTPUT_NAME}
) )
# Fix the framework rpath in the helper executable. # Fix the framework rpath in the helper executable.
@ -118,7 +120,7 @@ if(OS_MACOSX)
# Copy the helper app bundle into the Frameworks directory. # Copy the helper app bundle into the Frameworks directory.
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CEF_HELPER_APP}" "${CEF_HELPER_APP}"
"${CEF_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app" "${CEF_APP}/Contents/Frameworks/${CEF_HELPER_OUTPUT_NAME}.app"
# Copy the CEF framework into the Frameworks directory. # Copy the CEF framework into the Frameworks directory.
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CEF_BINARY_DIR}/Chromium Embedded Framework.framework" "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework"

8
tests/ceftests/CMakeLists.txt.in
View File

@ -57,7 +57,8 @@
# Target executable names. # Target executable names.
set(CEF_TARGET "ceftests") set(CEF_TARGET "ceftests")
if(OS_MACOSX) if(OS_MACOSX)
set(CEF_HELPER_TARGET "ceftests Helper") set(CEF_HELPER_TARGET "ceftests_Helper")
set(CEF_HELPER_OUTPUT_NAME "ceftests Helper")
endif() endif()
# Logical target used to link the libcef library. # Logical target used to link the libcef library.
@ -105,7 +106,7 @@ endif()
if(OS_MACOSX) if(OS_MACOSX)
# Output paths for the app bundles. # Output paths for the app bundles.
set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app") set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app")
set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_TARGET}.app") set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_OUTPUT_NAME}.app")
# Variable referenced from Info.plist files. # Variable referenced from Info.plist files.
set(PRODUCT_NAME "${CEF_TARGET}") set(PRODUCT_NAME "${CEF_TARGET}")
@ -117,6 +118,7 @@ if(OS_MACOSX)
target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper cef_gtest ${CEF_STANDARD_LIBS}) target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper cef_gtest ${CEF_STANDARD_LIBS})
set_target_properties(${CEF_HELPER_TARGET} PROPERTIES set_target_properties(${CEF_HELPER_TARGET} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/helper-Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/helper-Info.plist
OUTPUT_NAME ${CEF_HELPER_OUTPUT_NAME}
) )
# Fix the framework rpath in the helper executable. # Fix the framework rpath in the helper executable.
@ -138,7 +140,7 @@ if(OS_MACOSX)
# Copy the helper app bundle into the Frameworks directory. # Copy the helper app bundle into the Frameworks directory.
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CEF_HELPER_APP}" "${CEF_HELPER_APP}"
"${CEF_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app" "${CEF_APP}/Contents/Frameworks/${CEF_HELPER_OUTPUT_NAME}.app"
# Copy the CEF framework into the Frameworks directory. # Copy the CEF framework into the Frameworks directory.
COMMAND ${CMAKE_COMMAND} -E copy_directory COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CEF_BINARY_DIR}/Chromium Embedded Framework.framework" "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework"