From 22ac4942f7d783ec02f0d05b7496f5056c03ea98 Mon Sep 17 00:00:00 2001
From: redtide <redtid3@gmail.com>
Date: Sun, 1 Dec 2019 18:32:55 +0100
Subject: [PATCH] Adapt code and fix cmake script for Travis build

---
 cmake/CheckIPO.cmake |  4 ++--
 lv2/sfizz.c          | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cmake/CheckIPO.cmake b/cmake/CheckIPO.cmake
index ca0763a0..c110276f 100644
--- a/cmake/CheckIPO.cmake
+++ b/cmake/CheckIPO.cmake
@@ -2,7 +2,7 @@
 include (CheckIPOSupported)
 check_ipo_supported (RESULT result OUTPUT output)
 
-if (${result} AND ${ENABLE_LTO} AND ${CMAKE_BUILD_TYPE} STREQUAL "Release")
+if (result AND ENABLE_LTO AND CMAKE_BUILD_TYPE STREQUAL "Release")
     message (STATUS "\nLTO enabled.")
 else()
     if (${output})
@@ -14,7 +14,7 @@ else()
 endif()
 
 function (SFIZZ_ENABLE_LTO_IF_NEEDED TARGET)
-    if (${ENABLE_LTO})
+    if (ENABLE_LTO)
         message(STATUS "Enabling LTO on ${TARGET}")
         set_property (TARGET ${TARGET} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
     endif()
diff --git a/lv2/sfizz.c b/lv2/sfizz.c
index 87c09234..2d41624a 100644
--- a/lv2/sfizz.c
+++ b/lv2/sfizz.c
@@ -25,20 +25,20 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <lv2/atom/forge.h>
-#include <lv2/atom/util.h>
-#include <lv2/buf-size/buf-size.h>
-#include <lv2/core/lv2.h>
-#include <lv2/core/lv2_util.h>
-#include <lv2/midi/midi.h>
-#include <lv2/options/options.h>
-#include <lv2/parameters/parameters.h>
-#include <lv2/patch/patch.h>
-#include <lv2/state/state.h>
-#include <lv2/urid/urid.h>
-#include <lv2/worker/worker.h>
-#include <lv2/log/logger.h>
-#include <lv2/log/log.h>
+#include <lv2/lv2plug.in/ns/ext/atom/forge.h>
+#include <lv2/lv2plug.in/ns/ext/atom/util.h>
+#include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
+#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
+#include <lv2/lv2plug.in/ns/lv2core/lv2_util.h>
+#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
+#include <lv2/lv2plug.in/ns/ext/options/options.h>
+#include <lv2/lv2plug.in/ns/ext/parameters/parameters.h>
+#include <lv2/lv2plug.in/ns/ext/patch/patch.h>
+#include <lv2/lv2plug.in/ns/ext/state/state.h>
+#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
+#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
+#include <lv2/lv2plug.in/ns/ext/log/logger.h>
+#include <lv2/lv2plug.in/ns/ext/log/log.h>
 
 #include <math.h>
 #include <sfizz.h>