From 5e39f54ac05d946148e0cc8b4404227790b59a90 Mon Sep 17 00:00:00 2001 From: rsp4jack Date: Wed, 31 Jan 2024 20:03:08 +0800 Subject: [PATCH] Fix slugish --- .../cmake/CheckLoserHomeWork.cmake" | 2 +- .../cmake/Slugify.cmake" | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git "a/src/\347\276\244\345\217\213\346\217\220\344\272\244/cmake/CheckLoserHomeWork.cmake" "b/src/\347\276\244\345\217\213\346\217\220\344\272\244/cmake/CheckLoserHomeWork.cmake" index 9b4a1110..8cebd745 100644 --- "a/src/\347\276\244\345\217\213\346\217\220\344\272\244/cmake/CheckLoserHomeWork.cmake" +++ "b/src/\347\276\244\345\217\213\346\217\220\344\272\244/cmake/CheckLoserHomeWork.cmake" @@ -40,7 +40,7 @@ function(get_homework_target_name question_index cpp_file_path _target_name) is_valid_target_name("${file_name}" ret) if (NOT ret) slugify("${file_name}" slug) - message(NOTICE "not valid target name: ${question_index}_${file_name}, use: ${slug}") + message(NOTICE "not valid target name: ${file_name}, use: ${slug}") set(target_name "${question_index}_${slug}") else () set(target_name "${question_index}_${file_name}") diff --git "a/src/\347\276\244\345\217\213\346\217\220\344\272\244/cmake/Slugify.cmake" "b/src/\347\276\244\345\217\213\346\217\220\344\272\244/cmake/Slugify.cmake" index f7d2b6d8..ccb36340 100644 --- "a/src/\347\276\244\345\217\213\346\217\220\344\272\244/cmake/Slugify.cmake" +++ "b/src/\347\276\244\345\217\213\346\217\220\344\272\244/cmake/Slugify.cmake" @@ -6,11 +6,12 @@ function(slugify str _retname) string(MD5 strhash ${str}) file(WRITE ${CMAKE_BINARY_DIR}/slugify-${strhash}.txt "${str}") execute_process( - COMMAND ${PYTHON_EXECUTABLE} "-m" "slugify" "--stdin" + COMMAND ${Python_EXECUTABLE} "-m" "slugify" "--stdin" TIMEOUT 10 INPUT_FILE ${CMAKE_BINARY_DIR}/slugify-${strhash}.txt OUTPUT_VARIABLE sluggish COMMAND_ERROR_IS_FATAL ANY ) + string(STRIP ${sluggish} sluggish) set(${_retname} ${sluggish} PARENT_SCOPE) endfunction()