Improve build-defs.h configuration #36
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - This adds a CMake-related template for generating the `build-defs.h` header. - The ODBC build configuration is moved to its own `config.h` (or `php_config.h`) header. - Added `build-defs.h` also for Windows targets for simplicity of handling configuration header templates, although this separates the CMake-based and upstream build systems even more. - Fixed build when using multi-config generators (Ninja Multi-Config, Visual Studio, etc.). This now generates `build-defs.h` and `php_config.h`/`config.w32.h` files in a separate directory `<CONFIG>/main`, where `<CONFIG>` is one of the build configurations (Debug, Release ...). - Initial preparations to remove the redundant and complex PHP/ConfigureFile CMake module. - Further fixes are needed but this now at least enables building PHP a bit better than before. PHP at this point is still not relocatable (to be able to utilize paths in a relative way, depending on the current executable).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds a CMake-related template for generating the
main/build-defs.hheader.The ODBC build configuration is moved to its own config.h (or php_config.h) header.