From aee39b961ea5dd4b1fe3a7b7090a2bd7e13300fe Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Mon, 11 Feb 2019 13:36:48 -0800 Subject: cmake: Fix 'make' generator targets 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 --- projects/CMake/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index d15c57f..3d07447 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -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) -- cgit v1.2.3