Skip to content

Commit 68a7093

Browse files
committed
Fix export IDN and AIO
Fix export IDN and AIO b136f876eac2579a7b34019ebbf179f988d2a8b2
1 parent bb81bb3 commit 68a7093

File tree

6 files changed

+44
-8
lines changed

6 files changed

+44
-8
lines changed

build/export_generators/cmake/cmake/FindAIO.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
find_path(AIO_INCLUDE_DIR
88
libaio.h
9-
HINTS $ENV{AIO_ROOT}/include)
9+
HINTS $ENV{AIO_ROOT}/include /usr/include REQUIRED)
1010

1111
find_library(AIO_LIBRARIES
1212
aio
13-
HINTS $ENV{AIO_ROOT}/lib)
13+
HINTS $ENV{AIO_ROOT}/lib REQUIRED)
1414

1515
include(FindPackageHandleStandardArgs)
1616
find_package_handle_standard_args(AIO DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIR)

build/export_generators/cmake/cmake/FindIDN.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
find_path(IDN_INCLUDE_DIR
88
idna.h
9-
HINTS $ENV{IDN_ROOT}/include)
9+
HINTS $ENV{IDN_ROOT}/include /usr/include REQUIRED)
1010

1111
find_library(IDN_LIBRARIES
1212
idn
13-
HINTS $ENV{IDN_ROOT}/lib)
13+
HINTS $ENV{IDN_ROOT}/lib REQUIRED)
1414

1515
include(FindPackageHandleStandardArgs)
1616
find_package_handle_standard_args(IDN DEFAULT_MSG IDN_LIBRARIES IDN_INCLUDE_DIR)

build/export_generators/cmake/generator.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,24 @@ copy=[
399399
]
400400
add_values=[{attr="includes", values=["cmake/swig.cmake"]}]
401401

402+
[[rules]]
403+
attrs=[
404+
"packages-name=IDN",
405+
]
406+
copy=[
407+
"cmake/FindIDN.cmake",
408+
]
409+
add_values=[{attr="includes", values=["cmake/FindIDN.cmake"]}]
410+
411+
[[rules]]
412+
attrs=[
413+
"packages-name=AIO",
414+
]
415+
copy=[
416+
"cmake/FindAIO.cmake",
417+
]
418+
add_values=[{attr="includes", values=["cmake/FindAIO.cmake"]}]
419+
402420
# Conan profiles for platforms
403421
[[rules]]
404422
platforms=[

build/export_generators/hardcoded-cmake/cmake/FindAIO.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
find_path(AIO_INCLUDE_DIR
88
libaio.h
9-
HINTS $ENV{AIO_ROOT}/include)
9+
HINTS $ENV{AIO_ROOT}/include /usr/include REQUIRED)
1010

1111
find_library(AIO_LIBRARIES
1212
aio
13-
HINTS $ENV{AIO_ROOT}/lib)
13+
HINTS $ENV{AIO_ROOT}/lib REQUIRED)
1414

1515
include(FindPackageHandleStandardArgs)
1616
find_package_handle_standard_args(AIO DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIR)

build/export_generators/hardcoded-cmake/cmake/FindIDN.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
find_path(IDN_INCLUDE_DIR
88
idna.h
9-
HINTS $ENV{IDN_ROOT}/include)
9+
HINTS $ENV{IDN_ROOT}/include /usr/include REQUIRED)
1010

1111
find_library(IDN_LIBRARIES
1212
idn
13-
HINTS $ENV{IDN_ROOT}/lib)
13+
HINTS $ENV{IDN_ROOT}/lib REQUIRED)
1414

1515
include(FindPackageHandleStandardArgs)
1616
find_package_handle_standard_args(IDN DEFAULT_MSG IDN_LIBRARIES IDN_INCLUDE_DIR)

build/export_generators/hardcoded-cmake/generator.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,24 @@ copy=[
211211
]
212212
add_values=[{attr="includes", values=["cmake/swig.cmake"]}]
213213

214+
[[rules]]
215+
attrs=[
216+
"find_package=IDN",
217+
]
218+
copy=[
219+
"cmake/FindIDN.cmake",
220+
]
221+
add_values=[{attr="includes", values=["cmake/FindIDN.cmake"]}]
222+
223+
[[rules]]
224+
attrs=[
225+
"find_package=AIO",
226+
]
227+
copy=[
228+
"cmake/FindAIO.cmake",
229+
]
230+
add_values=[{attr="includes", values=["cmake/FindAIO.cmake"]}]
231+
214232
# Conan profiles for platforms
215233
[[rules]]
216234
platforms=[

0 commit comments

Comments
 (0)