From f3b0c8091f969207f567c28c077c551468318819 Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Sun, 11 Jan 2015 18:33:55 +0100
Subject: [PATCH] Fix build again

---
 CMakeLists.txt     |  5 +++++
 src/CMakeLists.txt | 26 ++++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e84c600c..dcac2ce1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -432,6 +432,11 @@ SET(MACOSX_BUNDLE_MIMETYPE_ICON "project.icns")
 SET(MACOSX_BUNDLE_MIMETYPE_ID "net.sourceforge.lmms")
 SET(MACOSX_BUNDLE_PROJECT_URL "http://lmms.io")
 
+IF(WIN32)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
+ELSE(WIN32)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
+ENDIF(WIN32)
 
 # make sub-directories
 ADD_SUBDIRECTORY(plugins)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bcddade20..a39271d21 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,13 @@ IF(QT5)
 ELSE()
 	QT4_WRAP_UI(LMMS_UI_OUT ${LMMS_UIS})
 ENDIF()
+INCLUDE_DIRECTORIES(
+	"${CMAKE_CURRENT_BINARY_DIR}"
+	"${CMAKE_BINARY_DIR}"
+	"${CMAKE_BINARY_DIR}/include"
+	"${CMAKE_SOURCE_DIR}"
+	"${CMAKE_SOURCE_DIR}/include"
+)
 
 IF(WIN32)
 	SET(WINRC "${CMAKE_BINARY_DIR}/lmmsrc.obj")
@@ -21,22 +28,17 @@ IF(WIN32)
 					"-o\"${CMAKE_BINARY_DIR}/lmmsrc.obj\""
 					"-i\"${CMAKE_BINARY_DIR}/lmms.rc\""
 				DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
-ELSE(WIN32)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
-ENDIF(WIN32)
+ENDIF()
 
 # Paths relative to lmms executable
 FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
 FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/${BIN_DIR}" "/${PLUGIN_DIR}")
 ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR_RELATIVE}/"' -D'PLUGIN_DIR="${PLUGIN_DIR_RELATIVE}/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
-INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}"
-                    "${CMAKE_BINARY_DIR}/include"
-                    "${CMAKE_SOURCE_DIR}"
-                    "${CMAKE_SOURCE_DIR}/include"
-                    ${JACK_INCLUDE_DIRS}
-                    ${SAMPLERATE_INCLUDE_DIRS}
-                    ${SNDFILE_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(
+	${JACK_INCLUDE_DIRS}
+	${SAMPLERATE_INCLUDE_DIRS}
+	${SNDFILE_INCLUDE_DIRS}
+)
 
 IF(NOT ("${SDL_INCLUDE_DIR}" STREQUAL ""))
 	INCLUDE_DIRECTORIES("${SDL_INCLUDE_DIR}")
@@ -64,7 +66,7 @@ ADD_EXECUTABLE(lmms
 	"${WINRC}"
 )
 
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_out} lmmsconfig.h lmms.1.gz")
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz")
 
 IF(LMMS_BUILD_WIN32)
 	SET(EXTRA_LIBRARIES "-lwinmm")