Skip to content

Commit c135969

Browse files
ColdwingsColdwings
committed
Better cmake scripts
1 parent c300327 commit c135969

32 files changed

Lines changed: 437 additions & 674 deletions

‎CMake/Findaio.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
find_path(AIO_INCLUDE_DIRS libaio.h)
1+
include(photon-find-helpers)
22

3-
find_library(AIO_LIBRARIES aio)
4-
5-
find_package_handle_standard_args(aio DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIRS)
6-
7-
mark_as_advanced(AIO_INCLUDE_DIRS AIO_LIBRARIES)
3+
photon_find_package(aio HEADERS libaio.h LIBRARIES aio)

‎CMake/Findcurl.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
find_path(CURL_INCLUDE_DIRS curl/curl.h)
1+
include(photon-find-helpers)
22

3-
find_library(CURL_LIBRARIES curl)
4-
5-
find_package_handle_standard_args(curl DEFAULT_MSG CURL_LIBRARIES CURL_INCLUDE_DIRS)
6-
7-
mark_as_advanced(CURL_INCLUDE_DIRS CURL_LIBRARIES)
3+
photon_find_package(curl HEADERS curl/curl.h LIBRARIES curl)

‎CMake/Finddpdk.cmake‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,11 @@
11
find_package(PkgConfig REQUIRED)
22

3+
include(${CMAKE_CURRENT_LIST_DIR}/photon-dpdk-spdk-libs.cmake)
4+
35
pkg_check_modules(DPDK REQUIRED libdpdk)
46

57
set(DPDK_FOUND_LIBRARIES)
6-
set(DPDK_LIBRARY_NAMES
7-
rte_bus_pci
8-
rte_bus_vdev
9-
rte_cmdline
10-
rte_compressdev
11-
rte_cryptodev
12-
rte_eal
13-
rte_ethdev
14-
rte_hash
15-
rte_kvargs
16-
rte_mbuf
17-
rte_mempool
18-
rte_mempool_ring
19-
rte_meter
20-
rte_net
21-
rte_pci
22-
rte_power
23-
rte_rcu
24-
rte_reorder
25-
rte_ring
26-
rte_security
27-
rte_telemetry
28-
rte_timer
29-
rte_vhost
30-
rte_kni
31-
rte_net_bond
32-
)
33-
foreach(LIB_NAME IN LISTS DPDK_LIBRARY_NAMES)
8+
foreach(LIB_NAME IN LISTS PHOTON_DPDK_LIBRARY_NAMES)
349
find_library(FOUND_${LIB_NAME} NAMES ${LIB_NAME} PATHS ${DPDK_LIBRARY_DIRS} NO_DEFAULT_PATH)
3510
if(FOUND_${LIB_NAME})
3611
list(APPEND DPDK_FOUND_LIBRARIES ${FOUND_${LIB_NAME}})

‎CMake/Finde2fs.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
find_path(E2FS_INCLUDE_DIRS ext2fs/ext2fs.h)
1+
include(photon-find-helpers)
22

3-
find_library(E2FS_LIBRARIES ext2fs)
4-
5-
find_package_handle_standard_args(e2fs DEFAULT_MSG E2FS_LIBRARIES E2FS_INCLUDE_DIRS)
6-
7-
mark_as_advanced(E2FS_INCLUDE_DIRS E2FS_LIBRARIES)
3+
photon_find_package(e2fs HEADERS ext2fs/ext2fs.h LIBRARIES ext2fs)

‎CMake/Findfuse.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
find_path(FUSE_INCLUDE_DIRS fuse.h)
1+
include(photon-find-helpers)
22

3-
find_library(FUSE_LIBRARIES fuse)
4-
5-
find_package_handle_standard_args(fuse DEFAULT_MSG FUSE_LIBRARIES FUSE_INCLUDE_DIRS)
6-
7-
mark_as_advanced(FUSE_INCLUDE_DIRS FUSE_LIBRARIES)
3+
photon_find_package(fuse HEADERS fuse.h LIBRARIES fuse)

‎CMake/Findfuse3.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
find_path(FUSE3_INCLUDE_DIRS fuse3/fuse.h)
2-
3-
find_library(FUSE3_LIBRARIES fuse3)
4-
5-
find_package_handle_standard_args(fuse3 DEFAULT_MSG FUSE3_LIBRARIES FUSE3_INCLUDE_DIRS)
6-
7-
mark_as_advanced(FUSE3_INCLUDE_DIRS FUSE3_LIBRARIES)
1+
include(photon-find-helpers)
2+
3+
photon_find_package(fuse3 HEADERS fuse3/fuse.h LIBRARIES fuse3)

‎CMake/Findgflags.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1+
include(photon-find-helpers)
2+
13
if (NOT CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME)
24
# Cross-compiling: don't find system libs, build from source instead
35
set(GFLAGS_INCLUDE_DIRS "" CACHE STRING "")
46
set(GFLAGS_LIBRARIES "" CACHE STRING "")
57
return()
68
endif ()
79

8-
find_path(GFLAGS_INCLUDE_DIRS gflags/gflags.h)
9-
10-
find_library(GFLAGS_LIBRARIES gflags)
11-
12-
find_package_handle_standard_args(gflags DEFAULT_MSG GFLAGS_LIBRARIES GFLAGS_INCLUDE_DIRS)
13-
14-
mark_as_advanced(GFLAGS_INCLUDE_DIRS GFLAGS_LIBRARIES)
10+
photon_find_package(gflags HEADERS gflags/gflags.h LIBRARIES gflags)

‎CMake/Findgsasl.cmake‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
find_path(GSASL_INCLUDE_DIRS gsasl.h)
1+
include(photon-find-helpers)
22

3-
find_library(GSASL_LIBRARIES gsasl)
4-
5-
find_package_handle_standard_args(gsasl DEFAULT_MSG GSASL_LIBRARIES GSASL_INCLUDE_DIRS)
6-
7-
mark_as_advanced(GSASL_INCLUDE_DIRS GSASL_LIBRARIES)
3+
photon_find_package(gsasl HEADERS gsasl.h LIBRARIES gsasl)

‎CMake/Findspdk.cmake‎

Lines changed: 3 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,9 @@
11
find_package(PkgConfig REQUIRED)
22

3+
include(${CMAKE_CURRENT_LIST_DIR}/photon-dpdk-spdk-libs.cmake)
4+
35
set(SPDK_LIBRARIES)
4-
set(SPDK_LIBRARY_NAMES
5-
spdk_accel_ioat
6-
spdk_accel
7-
spdk_bdev_aio
8-
spdk_bdev_delay
9-
spdk_bdev_error
10-
spdk_bdev_ftl
11-
spdk_bdev_gpt
12-
spdk_bdev_lvol
13-
spdk_bdev_malloc
14-
spdk_bdev_null
15-
spdk_bdev_nvme
16-
spdk_bdev_passthru
17-
spdk_bdev
18-
spdk_bdev_raid
19-
spdk_bdev_split
20-
spdk_bdev_virtio
21-
spdk_bdev_zone_block
22-
spdk_blob_bdev
23-
spdk_blobfs_bdev
24-
spdk_blobfs
25-
spdk_blob
26-
spdk_conf
27-
spdk_env_dpdk
28-
spdk_env_dpdk_rpc
29-
spdk_event_accel
30-
spdk_event_bdev
31-
spdk_event_iscsi
32-
spdk_event_nbd
33-
spdk_event_net
34-
spdk_event_nvmf
35-
spdk_event
36-
spdk_event_scsi
37-
spdk_event_sock
38-
spdk_event_vhost
39-
spdk_event_vmd
40-
spdk_ftl
41-
spdk_ioat
42-
spdk_iscsi
43-
spdk_json
44-
spdk_jsonrpc
45-
spdk_lvol
46-
spdk_nbd
47-
spdk_net
48-
spdk_notify
49-
spdk_nvme
50-
spdk_nvmf
51-
spdk_rpc
52-
spdk_scsi
53-
spdk_sock
54-
spdk_sock_posix
55-
spdk_thread
56-
spdk_trace
57-
spdk_util
58-
spdk_vhost
59-
spdk_virtio
60-
spdk_vmd
61-
)
62-
foreach(LIB_NAME IN LISTS SPDK_LIBRARY_NAMES)
6+
foreach(LIB_NAME IN LISTS PHOTON_SPDK_LIBRARY_NAMES)
637
find_library(FOUND_${LIB_NAME} NAMES ${LIB_NAME} PATHS /usr/local/lib NO_DEFAULT_PATH)
648
if(FOUND_${LIB_NAME})
659
list(APPEND SPDK_LIBRARIES ${FOUND_${LIB_NAME}})

‎CMake/Finduring.cmake‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
set(URING_VERSION 2.3)
2-
3-
find_path(URING_INCLUDE_DIRS liburing.h)
1+
include(photon-find-helpers)
42

5-
find_library(URING_LIBRARIES uring)
6-
7-
find_package_handle_standard_args(uring DEFAULT_MSG URING_LIBRARIES URING_INCLUDE_DIRS)
3+
set(URING_VERSION 2.3)
84

9-
mark_as_advanced(URING_INCLUDE_DIRS URING_LIBRARIES)
5+
photon_find_package(uring HEADERS liburing.h LIBRARIES uring)
106

117
get_filename_component(URING_LIB_BASE ${URING_LIBRARIES} DIRECTORY)
128
if (NOT EXISTS "${URING_LIB_BASE}/liburing.so.${URING_VERSION}")
139
message(FATAL_ERROR "Requires liburing ${URING_VERSION}. Install it to system or try -D PHOTON_BUILD_DEPENDENCIES=ON")
14-
endif ()
10+
endif ()

0 commit comments

Comments
 (0)