fix build and install

This commit is contained in:
derselbst 2018-02-22 17:32:16 +01:00
parent 32d4fabf5c
commit 99bb97c5c4
2 changed files with 6 additions and 5 deletions

View file

@ -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

View file

@ -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 )