mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
cmake: mac: Remove cef_sandbox.a linking (see #3928)
This commit is contained in:
@ -361,14 +361,6 @@ if(OS_MAC)
|
|||||||
list(APPEND CEF_COMPILER_DEFINES
|
list(APPEND CEF_COMPILER_DEFINES
|
||||||
CEF_USE_SANDBOX # Used by apps to test if the sandbox is enabled
|
CEF_USE_SANDBOX # Used by apps to test if the sandbox is enabled
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND CEF_STANDARD_LIBS
|
|
||||||
-lsandbox
|
|
||||||
)
|
|
||||||
|
|
||||||
# CEF sandbox library paths.
|
|
||||||
set(CEF_SANDBOX_LIB_DEBUG "${CEF_BINARY_DIR_DEBUG}/cef_sandbox.a")
|
|
||||||
set(CEF_SANDBOX_LIB_RELEASE "${CEF_BINARY_DIR_RELEASE}/cef_sandbox.a")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# CEF Helper app suffixes.
|
# CEF Helper app suffixes.
|
||||||
|
@ -189,11 +189,6 @@ if(OS_MAC)
|
|||||||
set(EXECUTABLE_NAME "${CEF_TARGET}")
|
set(EXECUTABLE_NAME "${CEF_TARGET}")
|
||||||
set(PRODUCT_NAME "${CEF_TARGET}")
|
set(PRODUCT_NAME "${CEF_TARGET}")
|
||||||
|
|
||||||
if(USE_SANDBOX)
|
|
||||||
# Logical target used to link the cef_sandbox library.
|
|
||||||
ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Main app bundle target.
|
# Main app bundle target.
|
||||||
add_executable(${CEF_TARGET} MACOSX_BUNDLE ${CEFCLIENT_RESOURCES_SRCS} ${CEFCLIENT_SRCS})
|
add_executable(${CEF_TARGET} MACOSX_BUNDLE ${CEFCLIENT_RESOURCES_SRCS} ${CEFCLIENT_SRCS})
|
||||||
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET})
|
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET})
|
||||||
@ -246,10 +241,6 @@ if(OS_MAC)
|
|||||||
OUTPUT_NAME ${_helper_output_name}
|
OUTPUT_NAME ${_helper_output_name}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(USE_SANDBOX)
|
|
||||||
target_link_libraries(${_helper_target} cef_sandbox_lib)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Add the Helper as a dependency of the main executable target.
|
# Add the Helper as a dependency of the main executable target.
|
||||||
add_dependencies(${CEF_TARGET} "${_helper_target}")
|
add_dependencies(${CEF_TARGET} "${_helper_target}")
|
||||||
|
|
||||||
|
@ -105,11 +105,6 @@ if(OS_MAC)
|
|||||||
set(EXECUTABLE_NAME "${CEF_TARGET}")
|
set(EXECUTABLE_NAME "${CEF_TARGET}")
|
||||||
set(PRODUCT_NAME "${CEF_TARGET}")
|
set(PRODUCT_NAME "${CEF_TARGET}")
|
||||||
|
|
||||||
if(USE_SANDBOX)
|
|
||||||
# Logical target used to link the cef_sandbox library.
|
|
||||||
ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Main app bundle target.
|
# Main app bundle target.
|
||||||
add_executable(${CEF_TARGET} MACOSX_BUNDLE ${CEFSIMPLE_RESOURCES_SRCS} ${CEFSIMPLE_SRCS})
|
add_executable(${CEF_TARGET} MACOSX_BUNDLE ${CEFSIMPLE_RESOURCES_SRCS} ${CEFSIMPLE_SRCS})
|
||||||
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET})
|
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET})
|
||||||
@ -162,10 +157,6 @@ if(OS_MAC)
|
|||||||
OUTPUT_NAME ${_helper_output_name}
|
OUTPUT_NAME ${_helper_output_name}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(USE_SANDBOX)
|
|
||||||
target_link_libraries(${_helper_target} cef_sandbox_lib)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Add the Helper as a dependency of the main executable target.
|
# Add the Helper as a dependency of the main executable target.
|
||||||
add_dependencies(${CEF_TARGET} "${_helper_target}")
|
add_dependencies(${CEF_TARGET} "${_helper_target}")
|
||||||
|
|
||||||
|
@ -136,11 +136,6 @@ if(OS_MAC)
|
|||||||
set(EXECUTABLE_NAME "${CEF_TARGET}")
|
set(EXECUTABLE_NAME "${CEF_TARGET}")
|
||||||
set(PRODUCT_NAME "${CEF_TARGET}")
|
set(PRODUCT_NAME "${CEF_TARGET}")
|
||||||
|
|
||||||
if(USE_SANDBOX)
|
|
||||||
# Logical target used to link the cef_sandbox library.
|
|
||||||
ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Main app bundle target.
|
# Main app bundle target.
|
||||||
add_executable(${CEF_TARGET} MACOSX_BUNDLE ${UNITTESTS_RESOURCES_SRCS} ${UNITTESTS_SRCS})
|
add_executable(${CEF_TARGET} MACOSX_BUNDLE ${UNITTESTS_RESOURCES_SRCS} ${UNITTESTS_SRCS})
|
||||||
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET})
|
SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET})
|
||||||
@ -193,10 +188,6 @@ if(OS_MAC)
|
|||||||
OUTPUT_NAME ${_helper_output_name}
|
OUTPUT_NAME ${_helper_output_name}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(USE_SANDBOX)
|
|
||||||
target_link_libraries(${_helper_target} cef_sandbox_lib)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Add the Helper as a dependency of the main executable target.
|
# Add the Helper as a dependency of the main executable target.
|
||||||
add_dependencies(${CEF_TARGET} "${_helper_target}")
|
add_dependencies(${CEF_TARGET} "${_helper_target}")
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user