From a64f83e0ed3db685de33c5340d124cda3415c2b7 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 11 May 2020 15:20:36 +0200 Subject: [PATCH] Fix libcds MSVC compilation * Update to include 4227281c367a0dd36765bba58bd9bb6f43ceb88b fixing https://github.com/khizmax/libcds/issues/124 * Make CDS_BUILD_STATIC_LIB compile definition public to avoid dllimport attribute in defs.h * Make dependencies' defintions actually propagate to lmmsobjs --- src/3rdparty/CMakeLists.txt | 2 +- src/3rdparty/libcds | 2 +- src/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt index 16fea6b63..01cf80dee 100644 --- a/src/3rdparty/CMakeLists.txt +++ b/src/3rdparty/CMakeLists.txt @@ -52,7 +52,7 @@ ENDIF() IF(CDS_LIBRARY_TYPE STREQUAL "STATIC") TARGET_COMPILE_DEFINITIONS(cds - PRIVATE CDS_BUILD_STATIC_LIB + PUBLIC CDS_BUILD_STATIC_LIB ) ELSE() TARGET_COMPILE_DEFINITIONS(cds diff --git a/src/3rdparty/libcds b/src/3rdparty/libcds index e5bba766b..44c052bdb 160000 --- a/src/3rdparty/libcds +++ b/src/3rdparty/libcds @@ -1 +1 @@ -Subproject commit e5bba766b939f96b5f47fe470a3711ff3afe9ee2 +Subproject commit 44c052bdb69aaf26d7010074547356c80e55421a diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79241ab51..8dce3de7c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -123,7 +123,7 @@ TARGET_INCLUDE_DIRECTORIES(lmms # See the documentation of DEFINE_SYMBOL for details. # Also add LMMS_STATIC_DEFINE for targets linking against it. TARGET_COMPILE_DEFINITIONS(lmmsobjs - PRIVATE -Dlmmsobjs_EXPORTS + PRIVATE -Dlmmsobjs_EXPORTS $ INTERFACE -DLMMS_STATIC_DEFINE ) TARGET_COMPILE_DEFINITIONS(lmms