From 9a9580a9f078bf310f874235b72aba71a7a3e1b3 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Tue, 28 Nov 2017 15:47:03 +0100 Subject: [PATCH] Fix export errors with MinGW --- src/CMakeLists.txt | 12 ++++++++---- tests/CMakeLists.txt | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9544c2191..fa9754005 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -105,10 +105,6 @@ ADD_LIBRARY(lmmsobjs OBJECT GENERATE_EXPORT_HEADER(lmmsobjs BASE_NAME lmms ) -# GENERATE_EXPORT_HEADER doesn't seem to do this automatically -TARGET_COMPILE_DEFINITIONS(lmmsobjs - PRIVATE -Dlmmsobjs_EXPORTS -) ADD_EXECUTABLE(lmms core/main.cpp @@ -119,6 +115,14 @@ TARGET_INCLUDE_DIRECTORIES(lmms PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ) +# GENERATE_EXPORT_HEADER doesn't do this automatically for OBJECT libraries +TARGET_COMPILE_DEFINITIONS(lmmsobjs + PRIVATE -Dlmmsobjs_EXPORTS +) +TARGET_COMPILE_DEFINITIONS(lmms + PRIVATE -Dlmmsobjs_EXPORTS +) + SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz") IF(LMMS_BUILD_WIN32) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ca78a5eb4..249e38191 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,6 +2,7 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}") INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}") +INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/src") SET(CMAKE_CXX_STANDARD 11)