Fixed build issues when building in "getting_started" dir #662
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
Fixes #646 Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>
achristoforides
requested review from
carneyweb,
jeffdiclemente and
pelliott-mathworks
Codecov Report
@@ Coverage Diff @@
## development #662 +/- ##
===============================================
- Coverage 90.49% 90.48% -0.02%
===============================================
Files 249 249
Lines 13483 13478 -5
===============================================
- Hits 12202 12195 -7
- Misses 1281 1283 +2
|
jeffdiclemente
approved these changes
Apr 26, 2022
Comment on lines
11
to
26
| # Detect "local" build (build from getting started directory) | ||
| if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) | ||
| set(IS_LOCAL_BUILD ON) | ||
| endif() | ||
|
|
||
| if (IS_LOCAL_BUILD) | ||
| # Set binary and library output directories | ||
| set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") | ||
| set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") | ||
| set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") | ||
|
|
||
| set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries") | ||
| set(US_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) | ||
|
|
||
| set(CMAKE_ENABLE_EXPORTS ON) | ||
| endif() |
There was a problem hiding this comment.
is the IS_LOCAL_BUILD variable needed? can't it be one if statement?
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
# Set binary and library output directories
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries")
set(US_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
set(CMAKE_ENABLE_EXPORTS ON)
endif()
pelliott-mathworks
approved these changes
Apr 26, 2022
insi-eb
pushed a commit
to insi-eb/CppMicroServices-cpp14
that referenced
this pull request
Oct 5, 2022
…rvices#662) * Fixed build issues when building in "getting_started" dir Fixes CppMicroServices#646 Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com> * Made changes requested by reviewer
jeffdiclemente
pushed a commit
that referenced
this pull request
Oct 5, 2022
* Fixed build issues when building in "getting_started" dir Fixes #646 Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com> * Made changes requested by reviewer Co-authored-by: Alexander Christoforides <38366659+achristoforides@users.noreply.github.com>
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.
Fixes #646
Also fixes #625
Signed-off-by: The MathWorks, Inc. alchrist@mathworks.com