From 8fdbac521fc6b010248921dfb0d63bc2e6bee0a5 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Sat, 27 Jan 2018 19:58:15 +0100 Subject: [PATCH] move ADD_CUSTOM_QRC_PATH function to its own file --- cmake/macros/AddCustomQrcPath.cmake | 7 +++++++ interface/CMakeLists.txt | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 cmake/macros/AddCustomQrcPath.cmake diff --git a/cmake/macros/AddCustomQrcPath.cmake b/cmake/macros/AddCustomQrcPath.cmake new file mode 100644 index 0000000000..6bd54baa4d --- /dev/null +++ b/cmake/macros/AddCustomQrcPath.cmake @@ -0,0 +1,7 @@ +# adds a custom path and local path to the inserted CUSTOM_PATHS_VAR list which +# can be given to the GENERATE_QRC command + +function(ADD_CUSTOM_QRC_PATH CUSTOM_PATHS_VAR IMPORT_PATH LOCAL_PATH) + list(APPEND ${CUSTOM_PATHS_VAR} "${IMPORT_PATH}=${LOCAL_PATH}") + set(${CUSTOM_PATHS_VAR} ${${CUSTOM_PATHS_VAR}} PARENT_SCOPE) +endfunction() diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index fc3bc4a0d1..a49019e775 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -13,11 +13,6 @@ endfunction() set(CUSTOM_INTERFACE_QRC_PATHS "") -function(ADD_CUSTOM_QRC_PATH CUSTOM_PATHS_VAR IMPORT_PATH LOCAL_PATH) - list(APPEND ${CUSTOM_PATHS_VAR} "${IMPORT_PATH}=${LOCAL_PATH}") - set(${CUSTOM_PATHS_VAR} ${${CUSTOM_PATHS_VAR}} PARENT_SCOPE) -endfunction() - find_npm() if (BUILD_TOOLS AND NPM_EXECUTABLE)