From ddfd38d8c3bb0fa04bd7d88fce49b09dd30b8767 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 22 Dec 2017 20:31:35 +0100 Subject: [PATCH] Remove cmake hoop to change file permissions As we are using cmake's own configure_file command, it will just copy the permissions of the input file, which is what we want here. --- libgnucash/quotes/CMakeLists.txt | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt index e42ec9c568..91bd518b6e 100644 --- a/libgnucash/quotes/CMakeLists.txt +++ b/libgnucash/quotes/CMakeLists.txt @@ -1,27 +1,10 @@ - - -SET(PERL ${PERL_EXECUTABLE}) - -SET(_TMPDIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}) -FILE(WRITE ${_TMPDIR}/copy_with_perms.cmake - "FILE(COPY \${SRC} DESTINATION \${DST} - FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)" -) - SET(_BIN_FILES "") FOREACH(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump) STRING(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file}) SET(_ABS_OUTPUT_FILE ${BINDIR_BUILD}/${_OUTPUT_FILE_NAME}) - configure_file( ${file} ${_OUTPUT_FILE_NAME} @ONLY) + configure_file( ${file} ${_ABS_OUTPUT_FILE} @ONLY) LIST(APPEND _BIN_FILES ${_ABS_OUTPUT_FILE}) - ADD_CUSTOM_COMMAND( - OUTPUT ${_ABS_OUTPUT_FILE} - COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_BINARY_DIR}/${_OUTPUT_FILE_NAME} - -D DST=${BINDIR_BUILD} - -P ${_TMPDIR}/copy_with_perms.cmake - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_OUTPUT_FILE_NAME} - ) ENDFOREACH(file) SET(CMAKE_COMMAND_TMP "") @@ -32,7 +15,7 @@ ENDIF() SET(_MAN_FILES "") FOREACH(file gnc-fq-dump gnc-fq-helper) - SET(_POD_INPUT ${CMAKE_CURRENT_BINARY_DIR}/${file}) + SET(_POD_INPUT ${BINDIR_BUILD}/${file}) SET(_MAN_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file}.1) LIST(APPEND _MAN_FILES ${_MAN_OUTPUT}) ADD_CUSTOM_COMMAND(