From 99bb97c5c42416c8ccfae1c2c444a3801b7d0e3c Mon Sep 17 00:00:00 2001
From: derselbst <tom.mbrt@googlemail.com>
Date: Thu, 22 Feb 2018 17:32:16 +0100
Subject: [PATCH] fix build and install

---
 .travis.yml        | 5 +++--
 src/CMakeLists.txt | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f9d29a5..98fcead2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -192,9 +192,10 @@ before_install:
     - eval "${MATRIX_EVAL}"
     
 before_script:
+    - mkdir $HOME/fluidsynth_install/
     - mkdir build && cd build
     
 script:
-    - cmake ${CMAKE_FLAGS} "-Denable-portaudio=1" "-Denable-ladspa=1" "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ..
+    - cmake -DCMAKE_INSTALL_PREFIX=$HOME/fluidsynth_install ${CMAKE_FLAGS} "-Denable-portaudio=1" "-Denable-ladspa=1" "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ..
     - make -j4
-    - make install
+    - if [ $TRAVIS_OS_NAME = linux ]; then make install; fi # install only on linux, as CMAKE_INSTALL_PREFIX is ignored for frameworks on macosx and I cant tell whether that's correct or a bug
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35996691..132b59b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -204,8 +204,8 @@ set ( public_main_HEADER
     ${CMAKE_BINARY_DIR}/include/fluidsynth.h
 )
 
-configure_file ( ${CMAKE_SOURCE_DIR}/include/version.h.in 
-                 ${CMAKE_BINARY_DIR}/include/version.h )
+configure_file ( ${CMAKE_SOURCE_DIR}/include/fluidsynth/version.h.in 
+                 ${CMAKE_BINARY_DIR}/include/fluidsynth/version.h )
 configure_file ( ${CMAKE_SOURCE_DIR}/include/fluidsynth.cmake
                  ${public_main_HEADER} )
 
@@ -365,6 +365,6 @@ else ( MACOSX_FRAMEWORK )
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
     PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/fluidsynth 
 )
-   install ( FILES fluidsynth.h DESTINATION ${INCLUDE_INSTALL_DIR} )
+   install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} )
 endif ( MACOSX_FRAMEWORK )