Use PROJECT_SOURCE_DIR for cmake include_directories #471
Conversation
This file contains 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
The current usage of the CMAKE_SOURCE_DIR variable causes build breaks when compiling zlib in a subdirectory of the CMake tree. Instead of using CMAKE_SOURCE_DIR, we can use PROJECT_SOURCE_DIR to represent the root directory of where the ZLIB cmake project was declared. Note, this removes the need to special case include directories for MSVC.
|
I would have used |
wantehchang
added a commit
to wantehchang/zlib
that referenced
this pull request
May 25, 2023
When zlib is built via an add_subdirectory() call, ${CMAKE_SOURCE_DIR}
is the source directory of the parent project. Use
${CMAKE_CURRENT_SOURCE_DIR} instead to refer to the source directory of
the zlib project.
Remove a redundant include_directories(${CMAKE_CURRENT_SOURCE_DIR}) call
in the if(MSVC) block.
Note: This pull request is essentially the same as
madler#471. The only difference is to use
MAKE_CURRENT_SOURCE_DIR instead of PROJECT_SOURCE_DIR.
|
Hi schultetwin1, I came up with the changes in this pull request (plus the change Bagira80 suggested) independently. I just uploaded #818. If you make the change Bagira80 suggested, I will abandon my pull request. Thanks, |
Open
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.
The current usage of the CMAKE_SOURCE_DIR variable causes build breaks
when compiling zlib in a subdirectory of the CMake tree. Instead of
using CMAKE_SOURCE_DIR, we can use PROJECT_SOURCE_DIR to represent the
root directory of where the ZLIB cmake project was declared.
Note, this removes the need to special case include directories for
MSVC.