Skip to content

Commit

Permalink
cmake: Fix 'make' generator targets
Browse files Browse the repository at this point in the history
Remove 'RxCpp' library target when it's used outside of
Visual Studio. This was supposed to be a virtual target,
not an actual one that builds libRxCpp.so.

The build never worked because it was missing setting the
compiler/linker flags from shared.cmake

Resolves: #477
  • Loading branch information
iam authored and kirkshoop committed Feb 12, 2019
1 parent 8683567 commit aee39b9
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions projects/CMake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,12 @@ set(RX_SOURCES
# Grouping all the source files puts them into a virtual folder in Visual Studio
source_group("src" FILES ${RX_SOURCES})

if (MSVC)
# This 'RxCpp' build target only appears to be a virtual project for IDEs.
# It won't actually build correctly since it is missing the shared.cmake integration.
add_library(RxCpp SHARED ${RX_SOURCES})
SET_TARGET_PROPERTIES(RxCpp PROPERTIES LINKER_LANGUAGE CXX)
endif (MSVC)

set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE CACHE BOOL "Don't require all projects to be built in order to install" FORCE)

Expand Down

0 comments on commit aee39b9

Please sign in to comment.