Improvements to CMake configuration for the binary distribution (issue #1404).

- Add LIBCEF_APPEND_PLATFORM_SOURCES macro definition in libcef_dll/CMakeLists.txt to remove dependency on macros.cmake.
- Don't add the default "lib" prefix to the libcef_dll_wrapper output library name.
- Fix a documentation error in CMakeLists.txt.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1886 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-10-27 18:13:01 +00:00
parent 728cc7f423
commit 43dac54b44
3 changed files with 29 additions and 4 deletions

View File

@@ -4,9 +4,27 @@
add_definitions(-DUSING_CEF_SHARED)
# Append platform specific sources to a list of sources.
# Should be kept synchronized with APPEND_PLATFORM_SOURCES from macros.cmake.
macro(LIBCEF_APPEND_PLATFORM_SOURCES name_of_list)
if(OS_LINUX AND ${name_of_list}_LINUX)
list(APPEND ${name_of_list} ${${name_of_list}_LINUX})
endif()
if(OS_POSIX AND ${name_of_list}_POSIX)
list(APPEND ${name_of_list} ${${name_of_list}_POSIX})
endif()
if(OS_WINDOWS AND ${name_of_list}_WINDOWS)
list(APPEND ${name_of_list} ${${name_of_list}_WINDOWS})
endif()
if(OS_MACOSX AND ${name_of_list}_MACOSX)
list(APPEND ${name_of_list} ${${name_of_list}_MACOSX})
endif()
endmacro()
{{
'prefix': 'libcef',
'library': 'libcef_dll_wrapper',
'append_macro': 'LIBCEF_APPEND_PLATFORM_SOURCES',
'includes': [
'includes_common',
'autogen_cpp_includes',
@@ -20,3 +38,6 @@ add_definitions(-DUSING_CEF_SHARED)
'autogen_client_side',
],
}}
# Remove the default "lib" prefix from the resulting library.
set_target_properties(libcef_dll_wrapper PROPERTIES PREFIX "")