CMake refactoring and subproject friendliness #1304
Merged
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
Modeled after recent similar changes in OIIO.
* Detect if OSL is being built as a subproject, and if so, set
`OSL_IS_SUBPROJECT` (a.k.a. `${PROJECT_NAME}_IS_SUBPROJECT`).
* Move all the testing logic out of the main CMakeLists.txt (and a few
testing-related macros from oiio_macros.cmake) and into a new
src/cmake/testing.cmake.
* Move all of the packaging logic out of the main CMakeLists.txt and
into a new src/cmake/packaging.cmake.
* Make all the testing and packaging inactive if this is being built
as a subproject. Also disable the clang-format target for subprojects.
Signed-off-by: Larry Gritz <[email protected]>
lgritz
added a commit
to lgritz/OpenShadingLanguage
that referenced
this pull request
Dec 2, 2020
…ion#1304) Modeled after recent similar changes in OIIO. * Detect if OSL is being built as a subproject, and if so, set `OSL_IS_SUBPROJECT` (a.k.a. `${PROJECT_NAME}_IS_SUBPROJECT`). * Move all the testing logic out of the main CMakeLists.txt (and a few testing-related macros from oiio_macros.cmake) and into a new src/cmake/testing.cmake. * Move all of the packaging logic out of the main CMakeLists.txt and into a new src/cmake/packaging.cmake. * Make all the testing and packaging inactive if this is being built as a subproject. Also disable the clang-format target for subprojects. Signed-off-by: Larry Gritz <[email protected]>
lgritz
added a commit
to lgritz/OpenShadingLanguage
that referenced
this pull request
Dec 3, 2020
…ion#1304) Modeled after recent similar changes in OIIO. * Detect if OSL is being built as a subproject, and if so, set `OSL_IS_SUBPROJECT` (a.k.a. `${PROJECT_NAME}_IS_SUBPROJECT`). * Move all the testing logic out of the main CMakeLists.txt (and a few testing-related macros from oiio_macros.cmake) and into a new src/cmake/testing.cmake. * Move all of the packaging logic out of the main CMakeLists.txt and into a new src/cmake/packaging.cmake. * Make all the testing and packaging inactive if this is being built as a subproject. Also disable the clang-format target for subprojects. Signed-off-by: Larry Gritz <[email protected]>
lgritz
added a commit
to lgritz/OpenShadingLanguage
that referenced
this pull request
Dec 3, 2020
…ion#1304) Modeled after recent similar changes in OIIO. * Detect if OSL is being built as a subproject, and if so, set `OSL_IS_SUBPROJECT` (a.k.a. `${PROJECT_NAME}_IS_SUBPROJECT`). * Move all the testing logic out of the main CMakeLists.txt (and a few testing-related macros from oiio_macros.cmake) and into a new src/cmake/testing.cmake. * Move all of the packaging logic out of the main CMakeLists.txt and into a new src/cmake/packaging.cmake. * Make all the testing and packaging inactive if this is being built as a subproject. Also disable the clang-format target for subprojects. Signed-off-by: Larry Gritz <[email protected]>
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.
Modeled after recent similar changes in OIIO.
Detect if OSL is being built as a subproject, and if so, set
OSL_IS_SUBPROJECT(a.k.a.${PROJECT_NAME}_IS_SUBPROJECT).Move all the testing logic out of the main CMakeLists.txt (and a few
testing-related macros from oiio_macros.cmake) and into a new
src/cmake/testing.cmake.
Move all of the packaging logic out of the main CMakeLists.txt and
into a new src/cmake/packaging.cmake.
Make all the testing and packaging inactive if this is being built
as a subproject. Also disable the clang-format target for subprojects.
Signed-off-by: Larry Gritz [email protected]