Change CMake find_library variables

alibaba · Nov 14, 2022 · 2231729 · 2231729
1 parent d5990b5
commit 2231729
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 34 deletions.
diff --git a/CMake/Findaio.cmake b/CMake/Findaio.cmake
@@ -1,8 +1,7 @@
-find_path(AIO_INCLUDE_DIR libaio.h)
+find_path(AIO_INCLUDE_DIRS libaio.h)
 
 find_library(AIO_LIBRARIES aio)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(aio DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIR)
+find_package_handle_standard_args(aio DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIRS)
 
-mark_as_advanced(AIO_INCLUDE_DIR AIO_LIBRARIES)
+mark_as_advanced(AIO_INCLUDE_DIRS AIO_LIBRARIES)
diff --git a/CMake/Findfuse.cmake b/CMake/Findfuse.cmake
@@ -1,8 +1,7 @@
-find_path(FUSE_INCLUDE_DIR fuse.h)
+find_path(FUSE_INCLUDE_DIRS fuse.h)
 
 find_library(FUSE_LIBRARIES fuse)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(fuse DEFAULT_MSG FUSE_LIBRARIES FUSE_INCLUDE_DIR)
+find_package_handle_standard_args(fuse DEFAULT_MSG FUSE_LIBRARIES FUSE_INCLUDE_DIRS)
 
-mark_as_advanced(FUSE_INCLUDE_DIR FUSE_LIBRARIES)
+mark_as_advanced(FUSE_INCLUDE_DIRS FUSE_LIBRARIES)
diff --git a/CMake/Findgflags.cmake b/CMake/Findgflags.cmake
@@ -1,8 +1,7 @@
-find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h)
+find_path(GFLAGS_INCLUDE_DIRS gflags/gflags.h)
 
 find_library(GFLAGS_LIBRARIES gflags)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(gflags DEFAULT_MSG GFLAGS_LIBRARIES GFLAGS_INCLUDE_DIR)
+find_package_handle_standard_args(gflags DEFAULT_MSG GFLAGS_LIBRARIES GFLAGS_INCLUDE_DIRS)
 
-mark_as_advanced(GFLAGS_INCLUDE_DIR GFLAGS_LIBRARIES)
+mark_as_advanced(GFLAGS_INCLUDE_DIRS GFLAGS_LIBRARIES)
diff --git a/CMake/Findgmock.cmake b/CMake/Findgmock.cmake
@@ -1,8 +1,7 @@
-find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
+find_path(GMOCK_INCLUDE_DIRS gmock/gmock.h)
 
 find_library(GMOCK_LIBRARIES gmock)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(gmock DEFAULT_MSG GMOCK_LIBRARIES GMOCK_INCLUDE_DIR)
+find_package_handle_standard_args(gmock DEFAULT_MSG GMOCK_LIBRARIES GMOCK_INCLUDE_DIRS)
 
-mark_as_advanced(GMOCK_INCLUDE_DIR GMOCK_LIBRARIES)
+mark_as_advanced(GMOCK_INCLUDE_DIRS GMOCK_LIBRARIES)
diff --git a/CMake/Findgsasl.cmake b/CMake/Findgsasl.cmake
@@ -1,8 +1,7 @@
-find_path(GSASL_INCLUDE_DIR gsasl.h)
+find_path(GSASL_INCLUDE_DIRS gsasl.h)
 
 find_library(GSASL_LIBRARIES gsasl)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(gsasl DEFAULT_MSG GSASL_LIBRARIES GSASL_INCLUDE_DIR)
+find_package_handle_standard_args(gsasl DEFAULT_MSG GSASL_LIBRARIES GSASL_INCLUDE_DIRS)
 
-mark_as_advanced(GSASL_INCLUDE_DIR GSASL_LIBRARIES)
+mark_as_advanced(GSASL_INCLUDE_DIRS GSASL_LIBRARIES)
diff --git a/CMake/pack.cmake b/CMake/pack.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.14)
 
 project(
         photon
-        VERSION 0.4.0
+        VERSION 0.4
         LANGUAGES C CXX ASM
 )
 
 # Utilities
+include(FindPackageHandleStandardArgs)
 include(CheckCXXCompilerFlag)
-include(CPack)
 include(FetchContent)
 set(FETCHCONTENT_QUIET false)