lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-05-31 16:21:13 +03:00
Code

cmake: Support build directories with special characters

Browse Source 
Signed-off-by: DDoSolitary <DDoSolitary@gmail.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
DDoSolitary 2021-02-05 15:14:22 +08:00 committed by Jakub Jelen
parent 0679945383
commit c8b2e68fb8
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -216,10 +216,10 @@ if (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND)
endif(UPDATE_ABI) endif(UPDATE_ABI)
endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND)
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET}) add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET} VERBATIM)
# Link compile database for clangd # Link compile database for clangd
execute_process(COMMAND cmake -E create_symlink execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
"${CMAKE_BINARY_DIR}/compile_commands.json" "${CMAKE_BINARY_DIR}/compile_commands.json"
"${CMAKE_SOURCE_DIR}/compile_commands.json") "${CMAKE_SOURCE_DIR}/compile_commands.json")

20
cmake/Modules/FindABIMap.cmake
View File

@ -302,12 +302,13 @@ function(get_file_list _TARGET_NAME)
add_custom_target( add_custom_target(
${_TARGET_NAME}_int ALL ${_TARGET_NAME}_int ALL
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-DOUTPUT_PATH="${_get_files_list_OUTPUT_PATH}" -DOUTPUT_PATH=${_get_files_list_OUTPUT_PATH}
-DDIRECTORIES="${_get_files_list_DIRECTORIES}" -DDIRECTORIES=${_get_files_list_DIRECTORIES}
-DFILES_PATTERNS="${_get_files_list_FILES_PATTERNS}" -DFILES_PATTERNS=${_get_files_list_FILES_PATTERNS}
-P ${_GET_FILES_LIST_SCRIPT} -P ${_GET_FILES_LIST_SCRIPT}
COMMENT COMMENT
"Searching for files" "Searching for files"
VERBATIM
) )
if (DEFINED _get_files_list_COPY_TO) if (DEFINED _get_files_list_COPY_TO)
@ -318,6 +319,7 @@ function(get_file_list _TARGET_NAME)
${_FILES_LIST_OUTPUT_PATH} ${_get_files_list_COPY_TO} ${_FILES_LIST_OUTPUT_PATH} ${_get_files_list_COPY_TO}
DEPENDS ${_TARGET_NAME}_int DEPENDS ${_TARGET_NAME}_int
COMMENT "Copying ${_TARGET_NAME} to ${_get_files_list_COPY_TO}" COMMENT "Copying ${_TARGET_NAME} to ${_get_files_list_COPY_TO}"
VERBATIM
) )
else() else()
add_custom_target(${_TARGET_NAME} ALL add_custom_target(${_TARGET_NAME} ALL
@ -369,12 +371,13 @@ function(extract_symbols _TARGET_NAME)
add_custom_target( add_custom_target(
${_TARGET_NAME}_int ALL ${_TARGET_NAME}_int ALL
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-DOUTPUT_PATH="${_SYMBOLS_OUTPUT_PATH}" -DOUTPUT_PATH=${_SYMBOLS_OUTPUT_PATH}
-DHEADERS_LIST_FILE="${_HEADERS_LIST_FILE}" -DHEADERS_LIST_FILE=${_HEADERS_LIST_FILE}
-DFILTER_PATTERN=${_extract_symbols_FILTER_PATTERN} -DFILTER_PATTERN=${_extract_symbols_FILTER_PATTERN}
-P ${_EXTRACT_SYMBOLS_SCRIPT} -P ${_EXTRACT_SYMBOLS_SCRIPT}
DEPENDS ${_extract_symbols_HEADERS_LIST} DEPENDS ${_extract_symbols_HEADERS_LIST}
COMMENT "Extracting symbols from headers" COMMENT "Extracting symbols from headers"
VERBATIM
) )
if (DEFINED _extract_symbols_COPY_TO) if (DEFINED _extract_symbols_COPY_TO)
@ -385,6 +388,7 @@ function(extract_symbols _TARGET_NAME)
${_SYMBOLS_OUTPUT_PATH} ${_extract_symbols_COPY_TO} ${_SYMBOLS_OUTPUT_PATH} ${_extract_symbols_COPY_TO}
DEPENDS ${_TARGET_NAME}_int DEPENDS ${_TARGET_NAME}_int
COMMENT "Copying ${_TARGET_NAME} to ${_extract_symbols_COPY_TO}" COMMENT "Copying ${_TARGET_NAME} to ${_extract_symbols_COPY_TO}"
VERBATIM
) )
else() else()
add_custom_target(${_TARGET_NAME} ALL add_custom_target(${_TARGET_NAME} ALL
@ -449,15 +453,16 @@ function(generate_map_file _TARGET_NAME)
${_TARGET_NAME}_int ALL ${_TARGET_NAME}_int ALL
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-DABIMAP_EXECUTABLE=${ABIMAP_EXECUTABLE} -DABIMAP_EXECUTABLE=${ABIMAP_EXECUTABLE}
-DSYMBOLS="${_SYMBOLS_FILE}" -DSYMBOLS=${_SYMBOLS_FILE}
-DCURRENT_MAP=${_generate_map_file_CURRENT_MAP} -DCURRENT_MAP=${_generate_map_file_CURRENT_MAP}
-DOUTPUT_PATH="${_MAP_OUTPUT_PATH}" -DOUTPUT_PATH=${_MAP_OUTPUT_PATH}
-DFINAL=${_generate_map_file_FINAL} -DFINAL=${_generate_map_file_FINAL}
-DBREAK_ABI=${_generate_map_file_BREAK_ABI} -DBREAK_ABI=${_generate_map_file_BREAK_ABI}
-DRELEASE_NAME_VERSION=${_generate_map_file_RELEASE_NAME_VERSION} -DRELEASE_NAME_VERSION=${_generate_map_file_RELEASE_NAME_VERSION}
-P ${_GENERATE_MAP_SCRIPT} -P ${_GENERATE_MAP_SCRIPT}
DEPENDS ${_generate_map_file_SYMBOLS} DEPENDS ${_generate_map_file_SYMBOLS}
COMMENT "Generating the map ${_TARGET_NAME}" COMMENT "Generating the map ${_TARGET_NAME}"
VERBATIM
) )
# Add a custom command setting the map as OUTPUT to allow it to be added as # Add a custom command setting the map as OUTPUT to allow it to be added as
@ -475,6 +480,7 @@ function(generate_map_file _TARGET_NAME)
${_generate_map_file_COPY_TO} ${_generate_map_file_COPY_TO}
DEPENDS ${_TARGET_NAME}_int DEPENDS ${_TARGET_NAME}_int
COMMENT "Copying ${_MAP_OUTPUT_PATH} to ${_generate_map_file_COPY_TO}" COMMENT "Copying ${_MAP_OUTPUT_PATH} to ${_generate_map_file_COPY_TO}"
VERBATIM
) )
else() else()
add_custom_target(${_TARGET_NAME} ALL add_custom_target(${_TARGET_NAME} ALL