Skip to content

cmake: stop adding dependency headers to global CMAKE_REQUIRED_INCLUDES - #15252

Closed
vszakats wants to merge 1 commit into
curl:masterfrom
vszakats:cm-drop-dep-req-includes
Closed

cmake: stop adding dependency headers to global CMAKE_REQUIRED_INCLUDES#15252
vszakats wants to merge 1 commit into
curl:masterfrom
vszakats:cm-drop-dep-req-includes

Conversation

@vszakats

Copy link
Copy Markdown
Member

It was done for zlib, brotli, libpsl, libssh2, wolfssh
(a copy-paste case for wolfssh).

Feature detections should not rely by default on dependency headers.
There is no evidence they do now. If it becomes necessary, headers
should added for the duration of the feature check.

Ref: 118977f
Cherry-picked from #15157

@vszakats

Copy link
Copy Markdown
Member Author

Turns out there is a side-effect of this patch:
It made the 'FreeBSD (cmake, openssl, clang, arm64' job no longer discover ldap.h and lber.h headers.
But, this seems to be fine, because this job never found the necessary libs in the first place, so OpenLDAP was not detected anyway. After this patch lib and header detection are in sync.
Tested here: #15268

On the other hand this job demonstrates that CMake's LDAP was never up to par with configure. OpenLDAP should be detected here, both libs and headers. This is a task for a future effort and PR.

pps83 pushed a commit to pps83/curl that referenced this pull request Apr 26, 2025
…DES`

It was done for `zlib`, `brotli`, `libpsl`, `libssh2`, `wolfssh`
(a copy-paste case for `wolfssh`).

Feature detections should not rely by default on dependency headers.
There is no evidence they do now. If it becomes necessary, headers
should added for the duration of the feature check.

Ref: 118977f
Cherry-picked from curl#15157
Closes curl#15252
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

1 participant