[yoshimi] Re: The unkillable zombie - another try.

  • From: Will Godfrey <willgodfrey@xxxxxxxxxxxxxxx>
  • To: yoshimi@xxxxxxxxxxxxx
  • Date: Sun, 13 Mar 2016 20:58:53 +0000

The attached patch *only* works on the current master, and should be applied
against src/CMakeLists.txt

It works for me on debian, but needs to be tested on fedora and related distros
- or indeed on any non-debian (or highly specialised) distros.

If this works correctly - all files in the correct places - then it brings two
more distros into the fold, without needing any special treatment.

fingers crossed :)

-- 
Will J Godfrey
http://www.musically.me.uk
Say you have a poem and I have a tune.
Exchange them and we can both have a poem, a tune, and a song.
37a38

include(GNUInstallDirs)
465c466
< install (DIRECTORY ../banks DESTINATION share/yoshimi
---
install (DIRECTORY ../banks DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yoshimi
476c477
< install (DIRECTORY ../examples DESTINATION share/yoshimi
---
install (DIRECTORY ../examples DESTINATION 
${CMAKE_INSTALL_DATAROOTDIR}/yoshimi
487c488
< install (DIRECTORY ../presets DESTINATION share/yoshimi
---
install (DIRECTORY ../presets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/yoshimi
498c499
< install (DIRECTORY ../doc/ DESTINATION share/doc/yoshimi
---
install (DIRECTORY ../doc/ DESTINATION 
${CMAKE_INSTALL_DATAROOTDIR}/doc/yoshimi
510c511
<     DESTINATION share/applications)
---
    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
512c513
<     DESTINATION share/pixmaps)
---
    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
514c515
<     DESTINATION share/icons)
---
    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
516c517
<     DESTINATION share/icons)
---
    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
518c519
<     DESTINATION share/appdata)
---
    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata)
520c521
<     DESTINATION share/man/man1)
---
    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1)
549,564c550,564

< include(GNUInstallDirs)

< if (EXISTS $ENV{LV2_PATH})
<     set(LV2_INSTALL_DIR $ENV{LV2_PATH} CACHE PATH "Specifies where the LV2 
libraries should be installed")
< else()
<     set(LV2_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/lv2 CACHE PATH "Specifies 
where the LV2 libraries should be installed")
< endif()

< pkg_check_modules(LV2 REQUIRED lv2>=1.0.0)
< if (LV2_FOUND)
<     message (STATUS "Found lv2 package ${LV2_VERSION}")
< else (LV2_FOUND)
<     message (FATAL_ERROR "lv2 package required but not found (version 1.0.0 
needed)")
< endif (LV2_FOUND)
< add_subdirectory(LV2_Plugin)
---
    if (EXISTS $ENV{LV2_PATH})
        set(LV2_INSTALL_DIR $ENV{LV2_PATH} CACHE PATH
        "Specifies where the LV2 libraries should be installed")
    else()
        set(LV2_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/lv2 CACHE PATH
        "Specifies where the LV2 libraries should be installed")
    endif()

    pkg_check_modules(LV2 REQUIRED lv2>=1.0.0)
    if (LV2_FOUND)
        message (STATUS "Found lv2 package ${LV2_VERSION}")
    else (LV2_FOUND)
        message (FATAL_ERROR "lv2 package required but not found (version 
1.0.0 needed)")
    endif (LV2_FOUND)
    add_subdirectory(LV2_Plugin)

Other related posts:

  • » [yoshimi] Re: The unkillable zombie - another try. - Will Godfrey