Skip to content

Commit 3f52eaf

Browse files
petkpetk
committed
Sync dba and odbc configuration headers
1 parent 5982808 commit 3f52eaf

File tree

4 files changed

+58
-113
lines changed

4 files changed

+58
-113
lines changed

‎cmake/ext/dba/CMakeLists.txt‎

Lines changed: 25 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -185,31 +185,19 @@ target_compile_definitions(php_dba PRIVATE ZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
185185
if(EXT_DBA_FLATFILE)
186186
target_sources(php_dba PRIVATE libflatfile/flatfile.c)
187187

188-
set(
189-
DBA_FLATFILE 1
190-
CACHE INTERNAL "Whether the flatfile DBA handler support is enabled"
191-
)
188+
set(DBA_FLATFILE 1)
192189
endif()
193190

194191
if(EXT_DBA_INIFILE)
195192
target_sources(php_dba PRIVATE libinifile/inifile.c)
196193

197-
set(
198-
DBA_INIFILE 1
199-
CACHE INTERNAL "Whether the inifile DBA handler support is enabled"
200-
)
194+
set(DBA_INIFILE 1)
201195
endif()
202196

203197
# Check for constant databases (cdb) support.
204198
if(EXT_DBA_CDB AND NOT EXT_DBA_CDB_EXTERNAL)
205-
set(
206-
DBA_CDB_BUILTIN
207-
1
208-
CACHE INTERNAL
209-
"Whether to use the bundled constant databases (cdb) library"
210-
)
211-
212-
set(DBA_CDB 1 CACHE INTERNAL "Whether the cdb support is enabled")
199+
set(DBA_CDB_BUILTIN 1)
200+
set(DBA_CDB 1)
213201

214202
target_sources(
215203
php_dba
@@ -229,12 +217,8 @@ elseif(EXT_DBA_CDB AND EXT_DBA_CDB_EXTERNAL)
229217

230218
target_link_libraries(php_dba PRIVATE Cdb::Cdb)
231219

232-
set(
233-
CDB_INCLUDE_FILE "${Cdb_INCLUDE_DIR}/cdb.h"
234-
CACHE INTERNAL "The cdb header file"
235-
)
236-
237-
set(DBA_CDB 1 CACHE INTERNAL "Whether the cdb support is enabled")
220+
set(CDB_INCLUDE_FILE "${Cdb_INCLUDE_DIR}/cdb.h")
221+
set(DBA_CDB 1)
238222
endif()
239223

240224
if(EXT_DBA_LMDB)
@@ -248,12 +232,8 @@ if(EXT_DBA_LMDB)
248232

249233
target_link_libraries(php_dba PRIVATE LMDB::LMDB)
250234

251-
set(
252-
LMDB_INCLUDE_FILE "${LMDB_INCLUDE_DIR}/lmdb.h"
253-
CACHE INTERNAL "The LMDB header file"
254-
)
255-
256-
set(DBA_LMDB 1 CACHE INTERNAL "Whether the LMDB support is enabled")
235+
set(LMDB_INCLUDE_FILE "${LMDB_INCLUDE_DIR}/lmdb.h")
236+
set(DBA_LMDB 1)
257237
endif()
258238

259239
if(EXT_DBA_TCDB)
@@ -267,12 +247,8 @@ if(EXT_DBA_TCDB)
267247

268248
target_link_libraries(php_dba PRIVATE TokyoCabinet::TokyoCabinet)
269249

270-
set(
271-
TCADB_INCLUDE_FILE "${TokyoCabinet_INCLUDE_DIR}/tcadb.h"
272-
CACHE INTERNAL "The Tokyo Cabinet header file"
273-
)
274-
275-
set(DBA_TCADB 1 CACHE INTERNAL "Whether the Tokyo Cabinet support is enabled")
250+
set(TCADB_INCLUDE_FILE "${TokyoCabinet_INCLUDE_DIR}/tcadb.h")
251+
set(DBA_TCADB 1)
276252
endif()
277253

278254
if(EXT_DBA_GDBM)
@@ -286,12 +262,8 @@ if(EXT_DBA_GDBM)
286262

287263
target_link_libraries(php_dba PRIVATE GDBM::GDBM)
288264

289-
set(
290-
GDBM_INCLUDE_FILE "${GDBM_INCLUDE_DIR}/gdbm.h"
291-
CACHE INTERNAL "The GDBM header file"
292-
)
293-
294-
set(DBA_GDBM 1 CACHE INTERNAL "Whether the GDBM support is enabled")
265+
set(GDBM_INCLUDE_FILE "${GDBM_INCLUDE_DIR}/gdbm.h")
266+
set(DBA_GDBM 1)
295267
elseif(EXT_DBA_QDBM)
296268
find_package(QDBM)
297269
set_package_properties(
@@ -303,12 +275,8 @@ elseif(EXT_DBA_QDBM)
303275

304276
target_link_libraries(php_dba PRIVATE QDBM::QDBM)
305277

306-
set(
307-
QDBM_INCLUDE_FILE "${QDBM_INCLUDE_DIR}/depot.h"
308-
CACHE INTERNAL "The QDBM header file"
309-
)
310-
311-
set(DBA_QDBM 1 CACHE INTERNAL "Whether the QDBM support is enabled")
278+
set(QDBM_INCLUDE_FILE "${QDBM_INCLUDE_DIR}/depot.h")
279+
set(DBA_QDBM 1)
312280
endif()
313281

314282
if(EXT_DBA_NDBM)
@@ -322,12 +290,8 @@ if(EXT_DBA_NDBM)
322290

323291
target_link_libraries(php_dba PRIVATE Ndbm::Ndbm)
324292

325-
set(
326-
NDBM_INCLUDE_FILE "${Ndbm_INCLUDE_DIR}/ndbm.h"
327-
CACHE INTERNAL "The ndbm header file"
328-
)
329-
330-
set(DBA_NDBM 1 CACHE INTERNAL "Whether the ndbm support is enabled")
293+
set(NDBM_INCLUDE_FILE "${Ndbm_INCLUDE_DIR}/ndbm.h")
294+
set(DBA_NDBM 1)
331295
endif()
332296

333297
if(EXT_DBA_DBM)
@@ -341,17 +305,9 @@ if(EXT_DBA_DBM)
341305

342306
target_link_libraries(php_dba PRIVATE Dbm::Dbm)
343307

344-
set(
345-
DBM_INCLUDE_FILE "${Dbm_INCLUDE_DIR}/dbm.h"
346-
CACHE INTERNAL "The dbm header file"
347-
)
348-
349-
set(DBA_DBM 1 CACHE INTERNAL "Whether the dbm support is enabled")
350-
351-
set(
352-
DBM_VERSION "${Dbm_IMPLEMENTATION}"
353-
CACHE INTERNAL "The dbm implementation name"
354-
)
308+
set(DBM_INCLUDE_FILE "${Dbm_INCLUDE_DIR}/dbm.h")
309+
set(DBA_DBM 1)
310+
set(DBM_VERSION "${Dbm_IMPLEMENTATION}")
355311
endif()
356312

357313
if(EXT_DBA_DB)
@@ -370,28 +326,14 @@ if(EXT_DBA_DB)
370326
target_link_libraries(php_dba PRIVATE BerkeleyDB::BerkeleyDB)
371327

372328
if(BerkeleyDB_DB1_INCLUDE_DIR)
373-
set(
374-
DB1_INCLUDE_FILE "${BerkeleyDB_DB1_INCLUDE_DIR}/db_185.h"
375-
CACHE INTERNAL "The Berkeley DB 1.x support/emulation header"
376-
)
377-
378-
set(
379-
DBA_DB1 1
380-
CACHE INTERNAL "Whether the Berkeley DB 1.x support/emulation is enabled"
381-
)
382-
383-
set(
384-
DB1_VERSION "Berkeley DB 1.85 emulation in DB"
385-
CACHE INTERNAL "Berkeley DB1 version string"
386-
)
387-
endif()
329+
set(DB1_INCLUDE_FILE "${BerkeleyDB_DB1_INCLUDE_DIR}/db_185.h")
388330

389-
set(
390-
DB4_INCLUDE_FILE "${BerkeleyDB_INCLUDE_DIR}/db.h"
391-
CACHE INTERNAL "The Berkeley DB header file"
392-
)
331+
set(DBA_DB1 1)
332+
set(DB1_VERSION "Berkeley DB 1.85 emulation in DB")
333+
endif()
393334

394-
set(DBA_DB4 1 CACHE INTERNAL "Whether the Berkeley DB support is enabled")
335+
set(DB4_INCLUDE_FILE "${BerkeleyDB_INCLUDE_DIR}/db.h")
336+
set(DBA_DB4 1)
395337
endif()
396338

397339
set(HAVE_DBA 1)

‎cmake/ext/odbc/CMakeLists.txt‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ to be defined."
7474
)
7575
mark_as_advanced(EXT_ODBC_VERSION)
7676

77-
set(
78-
ODBCVER "${EXT_ODBC_VERSION}"
79-
CACHE INTERNAL "The highest supported ODBC version"
80-
)
77+
set(ODBCVER "${EXT_ODBC_VERSION}")
8178

8279
if(NOT EXT_ODBC)
8380
return()
@@ -110,28 +107,37 @@ set_package_properties(
110107
target_link_libraries(php_odbc PRIVATE ODBC::ODBC)
111108

112109
if(EXT_ODBC_TYPE STREQUAL "adabas")
113-
set(HAVE_ADABAS 1 CACHE INTERNAL "Whether the ODBC type is Adabas.")
110+
set(HAVE_ADABAS 1)
114111
elseif(EXT_ODBC_TYPE STREQUAL "dbmaker")
115-
set(HAVE_DBMAKER 1 CACHE INTERNAL "Whether the ODBC type is DBMaker.")
112+
set(HAVE_DBMAKER 1)
116113
elseif(EXT_ODBC_TYPE MATCHES "^(empress|empress-bcs)$")
117-
set(HAVE_EMPRESS 1 CACHE INTERNAL "Whether the ODBC type is Empress.")
114+
set(HAVE_EMPRESS 1)
118115
elseif(EXT_ODBC_TYPE STREQUAL "esoob")
119-
set(HAVE_ESOOB 1 CACHE INTERNAL "Whether the ODBC type is Easysoft OOB.")
116+
set(HAVE_ESOOB 1)
120117
elseif(EXT_ODBC_TYPE STREQUAL "ibm-db2")
121-
set(HAVE_IBMDB2 1 CACHE INTERNAL "Whether the ODBC type is IBM DB2.")
118+
set(HAVE_IBMDB2 1)
122119
elseif(EXT_ODBC_TYPE STREQUAL "iODBC")
123-
set(HAVE_IODBC 1 CACHE INTERNAL "Whether the ODBC type is iODBC.")
120+
set(HAVE_IODBC 1)
124121
elseif(EXT_ODBC_TYPE STREQUAL "sapdb")
125-
set(HAVE_SAPDB 1 CACHE INTERNAL "Whether the ODBC type is SAP DB.")
122+
set(HAVE_SAPDB 1)
126123
elseif(EXT_ODBC_TYPE STREQUAL "solid")
127-
# TODO: Set based on the solid version:
128-
#set(HAVE_SOLID_35 1 CACHE INTERNAL "Whether the ODBC type is Solid.")
129-
#set(HAVE_SOLID_30 1 CACHE INTERNAL "Whether the ODBC type is Solid.")
130-
set(HAVE_SOLID 1 CACHE INTERNAL "Whether the ODBC type is Solid.")
124+
# TODO: Set based on the Solid version:
125+
#set(HAVE_SOLID_35 1)
126+
#set(HAVE_SOLID_30 1)
127+
set(HAVE_SOLID 1)
128+
129+
# Additional configuration for using obsolete <sqlunix.h> header on obsolete
130+
# systems.
131+
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
132+
set(SS_LINUX 1)
133+
elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
134+
set(SS_FBX 1)
135+
endif()
136+
131137
elseif(EXT_ODBC_TYPE STREQUAL "unixODBC")
132-
set(HAVE_UNIXODBC 1 CACHE INTERNAL "Whether the ODBC type is unixODBC.")
138+
set(HAVE_UNIXODBC 1)
133139
elseif(EXT_ODBC_TYPE STREQUAL "generic")
134-
set(HAVE_CODBC 1 CACHE INTERNAL "Whether the ODBC type is generic custom.")
140+
set(HAVE_CODBC 1)
135141
endif()
136142

137143
################################################################################
@@ -167,12 +173,9 @@ if(TARGET ODBC::ODBC)
167173
endif()
168174

169175
if(NOT EXT_ODBC_TYPE MATCHES "^(dbmaker|solid)$")
170-
set(
171-
HAVE_SQLDATASOURCES 1
172-
CACHE INTERNAL "Whether SQLDataSources function or macro is available."
173-
)
176+
set(HAVE_SQLDATASOURCES 1)
174177
endif()
175178

176-
set(HAVE_UODBC 1 CACHE INTERNAL "Whether the odbc extension is enabled")
179+
set(HAVE_UODBC 1)
177180

178181
configure_file(config.cmake.h.in config.h @ONLY)

‎cmake/ext/odbc/config.cmake.h.in‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,11 @@
4646

4747
/* The highest supported ODBC version. */
4848
#cmakedefine ODBCVER @ODBCVER@
49+
50+
/* Define to 1 to be able to use the wchar defs in the obsolete <sqlunix.h>
51+
header file on some FreeBSD systems. */
52+
#cmakedefine SS_FBX 1
53+
54+
/* Define to 1 to be able to use the obsolete <sqlunix.h> header file on some
55+
Linux systems. */
56+
#cmakedefine SS_LINUX 1

‎cmake/main/php_config.cmake.h.in‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -882,14 +882,6 @@
882882
/* The size of 'ssize_t', as computed by sizeof. */
883883
#cmakedefine SIZEOF_SSIZE_T @SIZEOF_SSIZE_T@
884884

885-
/* Define to 1 to be able to use the wchar defs in the obsolete <sqlunix.h>
886-
header file on some FreeBSD systems. */
887-
#cmakedefine SS_FBX 1
888-
889-
/* Define to 1 to be able to use the obsolete <sqlunix.h> header file on some
890-
Linux systems. */
891-
#cmakedefine SS_LINUX 1
892-
893885
/* Define to 1 if strerror_r returns char *. */
894886
#cmakedefine STRERROR_R_CHAR_P 1
895887

0 commit comments

Comments
 (0)