From cb10b5aabefa58f56714da40a31dffa896772e43 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Tue, 13 Jan 2015 01:13:14 +0100 Subject: [PATCH] Try fixing windows build --- src/CMakeLists.txt | 12 ++++++------ tests/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 93b9f8bdd..308726e95 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,17 +64,17 @@ ENDIF() # Enable C++11 ADD_DEFINITIONS("-std=c++0x") -ADD_LIBRARY(lmmslib STATIC +ADD_EXECUTABLE(lmms + core/main.cpp ${LMMS_SRCS} ${LMMS_INCLUDES} ${LMMS_UI_OUT} ${LMMS_ER_H} -) -ADD_EXECUTABLE(lmms - core/main.cpp "${WINRC}" ) -TARGET_LINK_LIBRARIES(lmms lmmslib) +SET_TARGET_PROPERTIES(lmms PROPERTIES + ENABLE_EXPORTS ON +) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz") @@ -134,7 +134,7 @@ ENDFOREACH(_item ${qm_targets}) IF(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows" - ENABLE_EXPORTS ON) + ) ADD_CUSTOM_COMMAND(TARGET lmms POST_BUILD COMMAND "${STRIP}" "$") INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1c29996e2..377063751 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -12,4 +12,4 @@ ADD_EXECUTABLE(tests QTestSuite ) TARGET_LINK_LIBRARIES(tests ${QT_LIBRARIES} ${QT_QTTEST_LIBRARY}) -TARGET_LINK_LIBRARIES(tests lmmslib) +TARGET_LINK_LIBRARIES(tests lmms)