Просмотр исходного кода

#IQRV #comment bugfix: [CMake] 静态库安装过滤语法问题处理

gifur 4 лет назад
Родитель
Сommit
4b852745d5
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      CMakeLists.txt

+ 3 - 3
CMakeLists.txt

@@ -258,7 +258,7 @@ else(MSVC)
 			if(NOT ${disk_length})
 				set(CURRENT_DISK "/opt/")
 			endif()
-		endif(WITH_CI_NUMBER)
+		endif()
 		set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}")
 		message(STATUS "OUTPUT_CUR_DISK_PATH: ${OUTPUT_CUR_DISK_PATH}")
 endif(MSVC)
@@ -503,8 +503,8 @@ foreach(bin_dir ${RVC_CONAN_DEP_LIBS})
 	message(STATUS "bin dir: ${bin_dir}")
 	# file(GLOB RVC_CONAN_BIN_FILES  LIST_DIRECTORIES false "${bin_dir}/*.so" "${bin_dir}/*.dll")
 	file(GLOB RVC_CONAN_BIN_FILES LIST_DIRECTORIES false "${bin_dir}/*")
-	list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\.a$")
-	list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\.lib$")
+	list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\\.a$")
+	list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\\.lib$")
 	# list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*libQt5Charts.so*")
 	install(PROGRAMS ${RVC_CONAN_BIN_FILES} DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries)
 endforeach()