Skip to content

Commit

Permalink
Fixed issue where DS/CA do not build if US_BUILD_TESTING isn't ON (#661)
Browse files Browse the repository at this point in the history
- Always cache the value of BUILD_SHARED_LIBS in _us_build_shared
  rather than only when US_BUILD_TESTING is ON

Signed-off-by: The MathWorks, Inc. <alchrist@mathworks.com>
  • Loading branch information
achristoforides committed Apr 25, 2022
1 parent 1983c52 commit 7364c9a
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ us_cache_var(US_BUILD_TESTING OFF BOOL "Build tests")
us_cache_var(US_BUILD_EXAMPLES OFF BOOL "Build example projects")
us_cache_var(US_USE_SYSTEM_GTEST OFF BOOL "Build using an external GTest installation" ADVANCED)

set(_us_build_shared ${BUILD_SHARED_LIBS})

if(NOT US_ENABLE_THREADING_SUPPORT AND US_ENABLE_TSAN)
message(SEND_WARN "Thread-sanitizer enabled without threading support. Forcing US_ENABLE_TSAN to OFF")
set(US_ENABLE_TSAN OFF)
Expand Down

0 comments on commit 7364c9a

Please sign in to comment.