Skip to content

Commit 75dca31

Browse files
petkpetk
committed
Add various improvements
- `<PackageName>_INCLUDE_DIRS` used in most targets to append INTERFACE_INCLUDE_DIRECTORIES - Testing better places for find module sanity checks - LDAP find module now provides components
1 parent 244370f commit 75dca31

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+241
-118
lines changed

‎cmake/cmake/modules/FindACL.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@ endif()
221221
if(NOT TARGET ACL::ACL)
222222
add_library(ACL::ACL UNKNOWN IMPORTED)
223223

224-
if(ACL_INCLUDE_DIR)
224+
if(ACL_INCLUDE_DIRS)
225225
set_target_properties(
226226
ACL::ACL
227227
PROPERTIES
228-
INTERFACE_INCLUDE_DIRECTORIES "${ACL_INCLUDE_DIR}"
228+
INTERFACE_INCLUDE_DIRECTORIES "${ACL_INCLUDE_DIRS}"
229229
)
230230
endif()
231231

‎cmake/cmake/modules/FindAppArmor.cmake‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,26 @@ set(AppArmor_INCLUDE_DIRS ${AppArmor_INCLUDE_DIR})
108108
set(AppArmor_LIBRARIES ${AppArmor_LIBRARY})
109109

110110
if(NOT TARGET AppArmor::AppArmor)
111-
add_library(AppArmor::AppArmor UNKNOWN IMPORTED)
111+
if(IS_ABSOLUTE "${AppArmor_LIBRARY}")
112+
add_library(AppArmor::AppArmor UNKNOWN IMPORTED)
113+
set_target_properties(
114+
AppArmor::AppArmor
115+
PROPERTIES
116+
IMPORTED_LINK_INTERFACE_LANGUAGES C
117+
IMPORTED_LOCATION "${AppArmor_LIBRARY}"
118+
)
119+
else()
120+
add_library(AppArmor::AppArmor INTERFACE IMPORTED)
121+
set_target_properties(
122+
AppArmor::AppArmor
123+
PROPERTIES
124+
IMPORTED_LIBNAME "${AppArmor_LIBRARY}"
125+
)
126+
endif()
112127

113128
set_target_properties(
114129
AppArmor::AppArmor
115130
PROPERTIES
116-
IMPORTED_LOCATION "${AppArmor_LIBRARY}"
117-
INTERFACE_INCLUDE_DIRECTORIES "${AppArmor_INCLUDE_DIR}"
131+
INTERFACE_INCLUDE_DIRECTORIES "${AppArmor_INCLUDE_DIRS}"
118132
)
119133
endif()

‎cmake/cmake/modules/FindArgon2.cmake‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,26 @@ set(Argon2_INCLUDE_DIRS ${Argon2_INCLUDE_DIR})
8989
set(Argon2_LIBRARIES ${Argon2_LIBRARY})
9090

9191
if(NOT TARGET Argon2::Argon2)
92-
add_library(Argon2::Argon2 UNKNOWN IMPORTED)
92+
if(IS_ABSOLUTE "${Argon2_LIBRARY}")
93+
add_library(Argon2::Argon2 UNKNOWN IMPORTED)
94+
set_target_properties(
95+
Argon2::Argon2
96+
PROPERTIES
97+
IMPORTED_LINK_INTERFACE_LANGUAGES C
98+
IMPORTED_LOCATION "${Argon2_LIBRARY}"
99+
)
100+
else()
101+
add_library(Argon2::Argon2 INTERFACE IMPORTED)
102+
set_target_properties(
103+
Argon2::Argon2
104+
PROPERTIES
105+
IMPORTED_LIBNAME "${Argon2_LIBRARY}"
106+
)
107+
endif()
93108

94109
set_target_properties(
95110
Argon2::Argon2
96111
PROPERTIES
97-
IMPORTED_LOCATION "${Argon2_LIBRARY}"
98-
INTERFACE_INCLUDE_DIRECTORIES "${Argon2_INCLUDE_DIR}"
112+
INTERFACE_INCLUDE_DIRECTORIES "${Argon2_INCLUDE_DIRS}"
99113
)
100114
endif()

‎cmake/cmake/modules/FindAspell.cmake‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ Module defines the following `IMPORTED` target(s):
1313
Result variables:
1414
1515
* `Aspell_FOUND` - Whether the package has been found.
16-
`Aspell_INCLUDE_DIRS`
17-
Include directories needed to use this package.
18-
`Aspell_LIBRARIES`
19-
Libraries needed to link to the package library.
16+
* `Aspell_INCLUDE_DIRS` - Include directories needed to use this package.
17+
* `Aspell_LIBRARIES` - Libraries needed to link to the package library.
2018
2119
Cache variables:
2220
@@ -109,20 +107,26 @@ endif()
109107
set(Aspell_LIBRARIES ${Aspell_LIBRARY})
110108

111109
if(NOT TARGET Aspell::Aspell)
112-
add_library(Aspell::Aspell UNKNOWN IMPORTED)
110+
if(IS_ABSOLUTE "${Aspell_LIBRARY}")
111+
add_library(Aspell::Aspell UNKNOWN IMPORTED)
112+
set_target_properties(
113+
Aspell::Aspell
114+
PROPERTIES
115+
IMPORTED_LINK_INTERFACE_LANGUAGES C
116+
IMPORTED_LOCATION "${Aspell_LIBRARY}"
117+
)
118+
else()
119+
add_library(Aspell::Aspell INTERFACE IMPORTED)
120+
set_target_properties(
121+
Aspell::Aspell
122+
PROPERTIES
123+
IMPORTED_LIBNAME "${Aspell_LIBRARY}"
124+
)
125+
endif()
113126

114127
set_target_properties(
115128
Aspell::Aspell
116129
PROPERTIES
117-
IMPORTED_LOCATION "${Aspell_LIBRARY}"
118-
INTERFACE_INCLUDE_DIRECTORIES "${Aspell_INCLUDE_DIR}"
130+
INTERFACE_INCLUDE_DIRECTORIES "${Aspell_INCLUDE_DIRS}"
119131
)
120-
121-
if(Aspell_PSPELL_INCLUDE_DIR)
122-
set_property(
123-
TARGET Aspell::Aspell
124-
APPEND PROPERTY
125-
INTERFACE_INCLUDE_DIRECTORIES "${Aspell_PSPELL_INCLUDE_DIR}"
126-
)
127-
endif()
128132
endif()

‎cmake/cmake/modules/FindBerkeleyDB.cmake‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,26 @@ list(REMOVE_DUPLICATES BerkeleyDB_INCLUDE_DIRS)
174174
set(BerkeleyDB_LIBRARIES ${BerkeleyDB_LIBRARY})
175175

176176
if(NOT TARGET BerkeleyDB::BerkeleyDB)
177-
add_library(BerkeleyDB::BerkeleyDB UNKNOWN IMPORTED)
177+
if(IS_ABSOLUTE "${BerkeleyDB_LIBRARY}")
178+
add_library(BerkeleyDB::BerkeleyDB UNKNOWN IMPORTED)
179+
set_target_properties(
180+
BerkeleyDB::BerkeleyDB
181+
PROPERTIES
182+
IMPORTED_LINK_INTERFACE_LANGUAGES C
183+
IMPORTED_LOCATION "${BerkeleyDB_LIBRARY}"
184+
)
185+
else()
186+
add_library(BerkeleyDB::BerkeleyDB INTERFACE IMPORTED)
187+
set_target_properties(
188+
BerkeleyDB::BerkeleyDB
189+
PROPERTIES
190+
IMPORTED_LIBNAME "${BerkeleyDB_LIBRARY}"
191+
)
192+
endif()
178193

179194
set_target_properties(
180195
BerkeleyDB::BerkeleyDB
181196
PROPERTIES
182-
IMPORTED_LOCATION "${BerkeleyDB_LIBRARY}"
183-
INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIR};${BerkeleyDB_DB1_INCLUDE_DIR}"
197+
INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIRS}"
184198
)
185199
endif()

‎cmake/cmake/modules/FindCapstone.cmake‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,26 @@ set(
126126
set(Capstone_LIBRARIES ${Capstone_LIBRARY})
127127

128128
if(NOT TARGET Capstone::Capstone)
129-
add_library(Capstone::Capstone UNKNOWN IMPORTED)
129+
if(IS_ABSOLUTE "${Capstone_LIBRARY}")
130+
add_library(Capstone::Capstone UNKNOWN IMPORTED)
131+
set_target_properties(
132+
Capstone::Capstone
133+
PROPERTIES
134+
IMPORTED_LINK_INTERFACE_LANGUAGES C
135+
IMPORTED_LOCATION "${Capstone_LIBRARY}"
136+
)
137+
else()
138+
add_library(Capstone::Capstone INTERFACE IMPORTED)
139+
set_target_properties(
140+
Capstone::Capstone
141+
PROPERTIES
142+
IMPORTED_LIBNAME "${Capstone_LIBRARY}"
143+
)
144+
endif()
130145

131146
set_target_properties(
132147
Capstone::Capstone
133148
PROPERTIES
134-
IMPORTED_LOCATION "${Capstone_LIBRARY}"
135149
INTERFACE_INCLUDE_DIRECTORIES "${Capstone_INCLUDE_DIRS}"
136150
)
137151
endif()

‎cmake/cmake/modules/FindCclient.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ if(NOT TARGET Cclient::Cclient)
351351
Cclient::Cclient
352352
PROPERTIES
353353
IMPORTED_LOCATION "${Cclient_LIBRARY}"
354-
INTERFACE_INCLUDE_DIRECTORIES "${Cclient_INCLUDE_DIR}"
354+
INTERFACE_INCLUDE_DIRECTORIES "${Cclient_INCLUDE_DIRS}"
355355
)
356356
endif()
357357

‎cmake/cmake/modules/FindCdb.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,6 @@ if(NOT TARGET Cdb::Cdb)
114114
Cdb::Cdb
115115
PROPERTIES
116116
IMPORTED_LOCATION "${Cdb_LIBRARY}"
117-
INTERFACE_INCLUDE_DIRECTORIES "${Cdb_INCLUDE_DIR}"
117+
INTERFACE_INCLUDE_DIRECTORIES "${Cdb_INCLUDE_DIRS}"
118118
)
119119
endif()

‎cmake/cmake/modules/FindCrypt.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ endif()
175175
if(NOT TARGET Crypt::Crypt)
176176
add_library(Crypt::Crypt UNKNOWN IMPORTED)
177177

178-
if(Crypt_INCLUDE_DIR)
178+
if(Crypt_INCLUDE_DIRS)
179179
set_target_properties(
180180
Crypt::Crypt
181181
PROPERTIES
182-
INTERFACE_INCLUDE_DIRECTORIES "${Crypt_INCLUDE_DIR}"
182+
INTERFACE_INCLUDE_DIRECTORIES "${Crypt_INCLUDE_DIRS}"
183183
)
184184
endif()
185185

‎cmake/cmake/modules/FindDbm.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ endif()
134134
if(NOT TARGET Dbm::Dbm)
135135
add_library(Dbm::Dbm UNKNOWN IMPORTED)
136136

137-
if(Dbm_INCLUDE_DIR)
137+
if(Dbm_INCLUDE_DIRS)
138138
set_target_properties(
139139
Dbm::Dbm
140140
PROPERTIES
141-
INTERFACE_INCLUDE_DIRECTORIES "${Dbm_INCLUDE_DIR}"
141+
INTERFACE_INCLUDE_DIRECTORIES "${Dbm_INCLUDE_DIRS}"
142142
)
143143
endif()
144144

0 commit comments

Comments
 (0)