Selaa lähdekoodia

style: 修改命名规范

INSTALL_LOG -> INSTALL_LOGDIR
SongZihuan 3 vuotta sitten
vanhempi
sitoutus
73a49c9c6a
2 muutettua tiedostoa jossa 6 lisäystä ja 6 poistoa
  1. 2 2
      CMakeLists.txt
  2. 4 4
      cmake/CMakeFindExternalProject/InstallDir.cmake

+ 2 - 2
CMakeLists.txt

@@ -55,7 +55,7 @@ else()
     wi_set_install_dir_quiet(NAMES aFunlang)  # 设置安装路径
 endif()
 
-to_native_path(${INSTALL_LOG} INSTALL_LOGDIR_NATIVE)
+to_native_path(${INSTALL_LOGDIR} INSTALL_LOGDIR_NATIVE)
 to_native_path(${INSTALL_LOCALSTATEDIR} INSTALL_LOCALSTATEDIR_NATIVE)
 to_native_path(${INSTALL_LANGDIR} INSTALL_LANGDIR_NATIVE)
 
@@ -160,7 +160,7 @@ function(install_directory dir)
     install(CODE "file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${dir})")  # 创建log目录
 endfunction()
 
-install_directory(${INSTALL_LOG})
+install_directory(${INSTALL_LOGDIR})
 install_directory(${INSTALL_LOCALSTATEDIR})
 install_directory(${INSTALL_LANGDIR})
 

+ 4 - 4
cmake/CMakeFindExternalProject/InstallDir.cmake

@@ -37,7 +37,7 @@ function(wi_set_install_dir_quiet)
         set(DEF_INSTALL_RESOURCEDIR ${CMAKE_INSTALL_DATAROOTDIR})  # 关联文件
         set(DEF_INSTALL_LOCALSTATEDIR ${CMAKE_INSTALL_LOCALSTATEDIR}/lib)
         set(DEF_INSTALL_LANGDIR ${DEF_INSTALL_LOCALSTATEDIR}/lang)
-        set(DEF_INSTALL_LOG ${CMAKE_INSTALL_LOCALSTATEDIR}/log)
+        set(DEF_INSTALL_LOGDIR ${CMAKE_INSTALL_LOCALSTATEDIR}/log)
     else()
         # unix类系统(Unix, Linux, MacOS, Cygwin等)把cmake文件安装到指定的系统的cmake文件夹中
         set(DEF_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${_names})
@@ -45,7 +45,7 @@ function(wi_set_install_dir_quiet)
         set(DEF_INSTALL_RESOURCEDIR ${CMAKE_INSTALL_DATAROOTDIR}/${_names})  # 关联文件 CMAKE_INSTALL_DATAROOTDIR指: share
         set(DEF_INSTALL_LOCALSTATEDIR ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/${_names})
         set(DEF_INSTALL_LANGDIR ${DEF_INSTALL_LOCALSTATEDIR}/lang)
-        set(DEF_INSTALL_LOG ${CMAKE_INSTALL_LOCALSTATEDIR}/log/${_names})
+        set(DEF_INSTALL_LOGDIR ${CMAKE_INSTALL_LOCALSTATEDIR}/log/${_names})
     endif()
 
     # 设定安装的目录
@@ -56,14 +56,14 @@ function(wi_set_install_dir_quiet)
     set(INSTALL_RESOURCEDIR ${DEF_INSTALL_RESOURCEDIR} CACHE PATH "Installation directory for resource files")  # 关联文件
     set(INSTALL_LOCALSTATEDIR ${DEF_INSTALL_LOCALSTATEDIR} CACHE PATH "Installation directory for lib files")
     set(INSTALL_LANGDIR ${DEF_INSTALL_LANGDIR} CACHE PATH "Installation directory for lang files")
-    set(INSTALL_LOG ${DEF_INSTALL_LOG} CACHE PATH "Installation directory for log files")
+    set(INSTALL_LOGDIR ${DEF_INSTALL_LOGDIR} CACHE PATH "Installation directory for log files")
 
     unset(DEF_INSTALL_CMAKEDIR)
     unset(DEF_INSTALL_INCLUDEDIR)
     unset(DEF_INSTALL_RESOURCEDIR)
     unset(DEF_INSTALL_LOCALSTATEDIR)
     unset(DEF_INSTALL_LANGDIR)
-    unset(DEF_INSTALL_LOG)
+    unset(DEF_INSTALL_LOGDIR)
 endfunction()
 
 function(wi_set_install_dir)