diff options
| -rw-r--r-- | libre/supercollider/PKGBUILD | 67 | ||||
| -rw-r--r-- | libre/supercollider/boost-1.67.patch | 12 | ||||
| -rw-r--r-- | libre/supercollider/supercollider-use_system_boost.patch | 359 |
3 files changed, 34 insertions, 404 deletions
diff --git a/libre/supercollider/PKGBUILD b/libre/supercollider/PKGBUILD index c2bd0f4b2..a19d94d3a 100644 --- a/libre/supercollider/PKGBUILD +++ b/libre/supercollider/PKGBUILD @@ -1,12 +1,12 @@ -# Maintainer (Arch): David Runge <dave@sleepmap.de> +# Maintainer (Arch): David Runge <dvzrv@archlinux.org> # Contributor (Arch): speps <speps at aur dot archlinux dot org> # Contributor (Arch): osc <farid at archlinux-br.org> # Contributor (Prabola): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> _name=SuperCollider pkgname=supercollider -pkgver=3.10.1 -pkgrel=2 +pkgver=3.10.4 +pkgrel=1 pkgrel+=.parabola1 pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition" pkgdesc+=" (built without qt5-webengine)" @@ -15,55 +15,56 @@ arch+=('armv7h' 'i686') url="https://supercollider.github.io" license=('GPL3') groups=('pro-audio') -depends=('boost-libs' 'desktop-file-utils' 'fftw' 'jack' 'qt5-svg' 'qt5-webkit' 'qt5-websockets' 'yaml-cpp') +depends=('avahi' 'desktop-file-utils' 'fftw' 'gcc-libs' 'glibc' 'libasound.so' +'libboost_filesystem.so' 'libboost_program_options.so' 'libboost_regex.so' +'libboost_thread.so' 'libjack.so' 'libsndfile.so' 'libx11' 'libyaml-cpp.so' +'qt5-base' 'qt5-svg' 'qt5-webkit' 'qt5-websockets' 'libreadline.so' +'systemd-libs') makedepends=('boost' 'cmake' 'emacs' 'qt5-tools') checkdepends=('xorg-server-xvfb') optdepends=('emacs: emacs interface' 'gedit: gedit interface' 'sc3-plugins: additional extension plugins for scsynth') +provides=("libscsynth.so" "sclang=${pkgver}" "scsynth=${pkgver}") +# fixes for system boost were not backported: +# https://github.com/supercollider/supercollider/issues/4743 source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source-linux.tar.bz2" - 'boost-1.67.patch' - "${pkgname}-use_system_boost.patch" -) + "${pkgname}-3.10.4-system_boost.patch::https://github.com/dvzrv/supercollider/commit/21f5c7f765223a77621c9a46beb95d0ac00115a4.patch") install="${pkgname}.install" -sha512sums=('283fb44f3c5d690f0c646782f3ac4d3cab6c9d787982006c85c743246f32bbe0de2b79dd1f6b183fd9a5085424b956c8e7c25878ef2418e50d41e1f8d85ed0b9' - '9980d77802f18fd56d2a13f24f070e81768d9111b2cc63e479a0e9b405a04aec28bc523e5d36aab0462af6a3831d64598470cdc6c3266431e2ca64aa427a6bf2' - 'd9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae') +sha512sums=('8d414e036899ed2c8f1e6852cf325d85f2b99b0fa98dc1bd832be6106c8ec4d71f130a3280a86abc24ff71606e98242899319f1c7ed782fbf02af375e0477f6b' + 'e460e53c425bcd15d26214d9e4d5d16aa5ab9b9922ed0b6ad74ad4d62baff7666110da80e9b488a6c60905fe6cc5845da67ec246a3e00139b570bdbda372b683') prepare() { mv -v "${_name}-Source" "${pkgname}-${pkgver}" cd "${pkgname}-${pkgver}" - # supernova build: - # https://github.com/supercollider/supercollider/issues/3981 - patch -Np1 -i ../boost-1.67.patch - # make sure system boost is used - # https://github.com/supercollider/supercollider/issues/4096 - patch -Np1 -i ../"${pkgname}-use_system_boost.patch" - mkdir -v build + patch -Np1 -i "../${pkgname}-3.10.4-system_boost.patch" } build() { - cd "${pkgname}-${pkgver}/build" - cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DLIBSCSYNTH=ON \ - -DFORTIFY=ON \ - -DSYSTEM_YAMLCPP=ON \ - -DSYSTEM_BOOST=ON \ - -DSC_VIM=OFF \ - -DSC_IDE=OFF \ - -DSC_QT=OFF - make VERBOSE=1 + cd "${pkgname}-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DLIBSCSYNTH=ON \ + -DFORTIFY=ON \ + -DSYSTEM_YAMLCPP=ON \ + -DSYSTEM_BOOST=ON \ + -DSC_VIM=OFF \ + -DSC_IDE=OFF \ + -DSC_QT=OFF \ + -B build \ + . + make VERBOSE=1 -C build } check() { cd "${pkgname}-${pkgver}/build" - xvfb-run make test ARGS="-V" || warning "Known failing tests: https://github.com/supercollider/supercollider/issues/3555" + xvfb-run make test ARGS="-V" -C build || echo "Known failing tests: https://github.com/supercollider/supercollider/issues/3555" } package() { - cd "${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - install -t "${pkgdir}/usr/share/doc/${pkgname}/" \ - -vDm 644 ../{AUTHORS,{CHANGELOG,README,README_LINUX}.md} + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install -C build + install -vDm 644 {AUTHORS,{CHANGELOG,README,README_LINUX}.md} \ + -t "${pkgdir}/usr/share/doc/${pkgname}/" } diff --git a/libre/supercollider/boost-1.67.patch b/libre/supercollider/boost-1.67.patch deleted file mode 100644 index 1d1abaf91..000000000 --- a/libre/supercollider/boost-1.67.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr supercollider-3.9.3.orig/server/supernova/utilities/time_tag.hpp supercollider-3.9.3/server/supernova/utilities/time_tag.hpp ---- supercollider-3.9.3.orig/server/supernova/utilities/time_tag.hpp 2018-03-28 23:05:07.000000000 +0300 -+++ supercollider-3.9.3/server/supernova/utilities/time_tag.hpp 2018-06-03 01:32:16.824417338 +0300 -@@ -230,7 +230,7 @@ public: - #ifdef BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG - time_duration offset = seconds(get_secs() - ntp_offset) + nanoseconds(get_nanoseconds()); - #else -- time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(get_nanoseconds()/1000); -+ time_duration offset = seconds(get_secs() - ntp_offset) + microseconds(long(get_nanoseconds()/1000)); - #endif - return ptime(base, offset); - } diff --git a/libre/supercollider/supercollider-use_system_boost.patch b/libre/supercollider/supercollider-use_system_boost.patch deleted file mode 100644 index 93c8c4fc2..000000000 --- a/libre/supercollider/supercollider-use_system_boost.patch +++ /dev/null @@ -1,359 +0,0 @@ -diff --git c/CMakeLists.txt w/CMakeLists.txt -index 063028774..a6b76f49b 100644 ---- c/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -253,20 +253,43 @@ if (NOT WIN32) - endif() - - if(SYSTEM_BOOST) -- set(Boost_USE_MULTITHREADED ON) -- find_package( Boost 1.50.0 COMPONENTS thread system filesystem program_options regex test_exec_monitor ) --endif() -- --if (Boost_FOUND) -- link_directories(${Boost_LIBRARY_DIRS}) -+ set(Boost_USE_MULTITHREADED ON) -+ find_package( Boost 1.50.0 COMPONENTS thread system filesystem program_options regex test_exec_monitor ) -+ if (Boost_FOUND) -+ # we're specifically setting up the boost libraries here, so we can -+ # name them -+ add_library(boost_thread_lib SHARED IMPORTED) -+ set_property(TARGET boost_thread_lib PROPERTY IMPORTED_LOCATION -+ ${Boost_THREAD_LIBRARY}) -+ add_library(boost_system_lib SHARED IMPORTED) -+ set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION -+ ${Boost_SYSTEM_LIBRARY}) -+ add_library(boost_filesystem_lib SHARED IMPORTED) -+ set_property(TARGET boost_filesystem_lib PROPERTY IMPORTED_LOCATION -+ ${Boost_FILESYSTEM_LIBRARY}) -+ add_library(boost_program_options_lib SHARED IMPORTED) -+ set_property(TARGET boost_program_options_lib PROPERTY -+ IMPORTED_LOCATION ${Boost_PROGRAM_OPTIONS_LIBRARY}) -+ add_library(boost_regex_lib SHARED IMPORTED) -+ set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION -+ ${Boost_REGEX_LIBRARY}) -+ add_library(boost_test_exec_monitor_lib SHARED IMPORTED) -+ set_property(TARGET boost_test_exec_monitor_lib PROPERTY -+ IMPORTED_LOCATION ${Boost_TEST_EXEC_MONITOR_LIBRARY}) -+ set(boost_include_dirs ${Boost_INCLUDE_DIRS}) -+ else() -+ set(SYSTEM_BOOST OFF) -+ set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost) -+ message(WARNING "Not using system boost because none was found.") -+ endif() - else() -- message(STATUS "building boost libraries manually") -+ set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost) - endif() - - if(SYSTEM_YAMLCPP) - find_package(YamlCpp) - else() -- set(YAMLCPP_FOUND OFF) -+ set(SYSTEM_YAMLCPP OFF) - endif() - - ############################################# -diff --git c/editors/sc-ide/CMakeLists.txt w/editors/sc-ide/CMakeLists.txt -index 50059bc2f..8e48194fc 100644 ---- c/editors/sc-ide/CMakeLists.txt -+++ w/editors/sc-ide/CMakeLists.txt -@@ -219,7 +219,6 @@ endif() - include_directories(${CMAKE_SOURCE_DIR}/include/common) - include_directories(${CMAKE_SOURCE_DIR}/common) - include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface) --include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost) - include_directories(${YAMLCPP_INCLUDE_DIR}) - # For QtCollider headers: - include_directories(${CMAKE_SOURCE_DIR}) -@@ -299,12 +298,8 @@ target_link_libraries( SuperCollider - oscpack - ) - --if(Boost_FOUND) -- target_link_libraries( SuperCollider ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) --else() -- # in-house-built boost system -- target_link_libraries( SuperCollider boost_system boost_filesystem ) --endif() -+target_link_libraries( SuperCollider boost_system_lib boost_filesystem_lib) -+include_directories(${boost_include_dirs}) - - if(APPLE) - target_link_libraries( ${ide_name} "-framework CoreServices -framework Foundation") -diff --git c/external_libraries/CMakeLists.txt w/external_libraries/CMakeLists.txt -index df33dc6f1..896ce6206 100644 ---- c/external_libraries/CMakeLists.txt -+++ w/external_libraries/CMakeLists.txt -@@ -2,7 +2,8 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/nova-simd/vec.hpp) - message(FATAL_ERROR "nova-simd submodule is missing: please run `git submodule init && git submodule update' from the toplevel of your git working tree") - endif() - --if(NOT Boost_FOUND) # we compile boost ourselves -+if(NOT SYSTEM_BOOST) # we compile boost ourselves -+ message(STATUS "Using bundled boost") - # boost thread - aux_source_directory(boost/libs/thread/src/ boost_thread_src ) - -@@ -14,66 +15,65 @@ if(NOT Boost_FOUND) # we compile boost ourselves - message(SEND_ERROR "we need to implement boost_thread") - endif() - -- aux_source_directory(boost/libs/system/src/ boost_system ) -- add_library(boost_system STATIC EXCLUDE_FROM_ALL ${boost_system}) -- target_include_directories(boost_system PUBLIC boost) -+ aux_source_directory(boost/libs/system/src/ boost_system_src ) -+ add_library(boost_system_lib STATIC EXCLUDE_FROM_ALL ${boost_system_src}) -+ target_include_directories(boost_system_lib PUBLIC boost) - -- aux_source_directory(boost/libs/program_options/src/ boost_program_options ) -- add_library(boost_program_options STATIC EXCLUDE_FROM_ALL ${boost_program_options}) -- target_include_directories(boost_program_options PUBLIC boost) -+ aux_source_directory(boost/libs/program_options/src/ boost_program_options_src ) -+ add_library(boost_program_options_lib STATIC EXCLUDE_FROM_ALL ${boost_program_options_src}) -+ target_include_directories(boost_program_options_lib PUBLIC boost) - - aux_source_directory(boost/libs/filesystem/src boost_filesystem_src) -- add_library(boost_filesystem STATIC EXCLUDE_FROM_ALL ${boost_filesystem_src}) -- target_include_directories(boost_filesystem PUBLIC boost) -+ add_library(boost_filesystem_lib STATIC EXCLUDE_FROM_ALL ${boost_filesystem_src}) -+ target_include_directories(boost_filesystem_lib PUBLIC boost) - - aux_source_directory(boost/libs/regex/src boost_regex_src) -- add_library(boost_regex STATIC EXCLUDE_FROM_ALL ${boost_regex_src}) -- target_include_directories(boost_regex PUBLIC boost) -+ add_library(boost_regex_lib STATIC EXCLUDE_FROM_ALL ${boost_regex_src}) -+ target_include_directories(boost_regex_lib PUBLIC boost) - - if(LTO) -- set_property(TARGET boost_program_options boost_system boost_filesystem -+ set_property(TARGET boost_program_options_lib boost_system_lib boost_filesystem_lib - APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report") - -- set_property(TARGET boost_program_options boost_system boost_filesystem -+ set_property(TARGET boost_program_options_lib boost_system_lib boost_filesystem_lib - APPEND PROPERTY LINK_FLAGS "-flto -flto-report") - endif() - -- add_library(boost_thread STATIC EXCLUDE_FROM_ALL ${boost_thread_src} ${boost_thread_platform}) -- target_link_libraries(boost_thread boost_system) -+ add_library(boost_thread_lib STATIC EXCLUDE_FROM_ALL ${boost_thread_src} ${boost_thread_platform}) -+ target_link_libraries(boost_thread_lib boost_system_lib) - # target_compile_definitions(boost_thread PUBLIC BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS) -- target_include_directories(boost_thread PUBLIC boost) -- target_compile_definitions(boost_thread PUBLIC BOOST_THREAD_USE_LIB) # for win32 -+ target_include_directories(boost_thread_lib PUBLIC boost) -+ target_compile_definitions(boost_thread_lib PUBLIC BOOST_THREAD_USE_LIB) # for win32 - - if(PTHREADS_FOUND) -- target_include_directories(boost_thread PUBLIC ${PTHREADS_INCLUDE_DIR}) -+ target_include_directories(boost_thread_lib PUBLIC ${PTHREADS_INCLUDE_DIR}) - endif() - if(WIN32) -- target_compile_definitions( boost_thread PRIVATE BOOST_THREAD_BUILD_LIB) -+ target_compile_definitions( boost_thread_lib PRIVATE BOOST_THREAD_BUILD_LIB) - endif() - - - if(CMAKE_SYSTEM_NAME MATCHES "Linux") -- target_compile_options(boost_thread PRIVATE -fPIC) -- target_link_libraries(boost_thread rt) -+ target_compile_options(boost_thread_lib PRIVATE -fPIC) -+ target_link_libraries(boost_thread_lib rt) - endif() - - if(LTO) -- set_property(TARGET boost_thread -+ set_property(TARGET boost_thread_lib - APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report") - -- set_property(TARGET boost_thread -+ set_property(TARGET boost_thread_lib - APPEND PROPERTY LINK_FLAGS "-flto -flto-report") - endif() - - set_property( TARGET -- boost_regex -- boost_thread -- boost_program_options -- boost_system -- boost_filesystem -+ boost_regex_lib -+ boost_thread_lib -+ boost_program_options_lib -+ boost_system_lib -+ boost_filesystem_lib - PROPERTY FOLDER 3rdparty - ) -- - endif() - - # tlsf -@@ -84,10 +84,9 @@ set_property(TARGET tlsf PROPERTY POSITION_INDEPENDENT_CODE TRUE) - - #oscpack - add_library(oscpack STATIC EXCLUDE_FROM_ALL "oscpack_build.cpp") --target_include_directories(oscpack PRIVATE boost) -+target_include_directories(oscpack PRIVATE ${boost_include_dirs}) - target_include_directories(oscpack INTERFACE oscpack_1_1_0 ) - -- - if(LTO) - set_property(TARGET oscpack tlsf - APPEND PROPERTY COMPILE_FLAGS "-flto -flto-report") -@@ -96,15 +95,15 @@ if(LTO) - APPEND PROPERTY LINK_FLAGS "-flto -flto-report") - endif() - --if(NOT YAMLCPP_FOUND) -- message(STATUS "using bundled libyaml-cpp") -+if(NOT SYSTEM_YAMLCPP) -+ message(STATUS "Using bundled yaml-cpp") - - # yaml-cpp - aux_source_directory(${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/src yaml_src) - CREATE_FINAL_FILE(${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp ${yaml_src}) - - add_library(yaml STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp) -- target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include boost) -+ target_include_directories(yaml PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include ${boost_include_dirs}) - set_property( TARGET yaml PROPERTY FOLDER 3rdparty ) - set(YAMLCPP_LIBRARY yaml) - set(YAMLCPP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include) -diff --git c/lang/CMakeLists.txt w/lang/CMakeLists.txt -index c68b32fdc..593d91845 100644 ---- c/lang/CMakeLists.txt -+++ w/lang/CMakeLists.txt -@@ -202,14 +202,8 @@ if(SC_HIDAPI) - endif() - endif() - --if (Boost_FOUND) -- target_include_directories(libsclang PUBLIC ${Boost_INCLUDE_DIRS}) -- target_link_libraries(libsclang ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}) --else() -- target_include_directories(libsclang PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost) -- target_link_libraries(libsclang boost_regex boost_thread boost_system boost_filesystem) --endif() -- -+target_link_libraries(libsclang boost_thread_lib boost_system_lib boost_regex_lib boost_filesystem_lib) -+target_include_directories(libsclang PUBLIC ${boost_include_dirs}) - - if (SCLANG_SERVER) - target_link_libraries(libsclang libscsynth) -diff --git c/server/CMakeLists.txt w/server/CMakeLists.txt -index 2622b4e36..bf8dc863d 100644 ---- c/server/CMakeLists.txt -+++ w/server/CMakeLists.txt -@@ -12,11 +12,7 @@ include_directories(${CMAKE_SOURCE_DIR}/external_libraries - ${CMAKE_SOURCE_DIR}/external_libraries/nova-tt - ) - --if (Boost_FOUND) -- include_directories(${Boost_INCLUDE_DIRS}) --else() -- include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost) --endif() -+include_directories(${boost_include_dirs}) - - # here we choose who provides us with the FFT lib - if (APPLE) -diff --git c/server/plugins/CMakeLists.txt w/server/plugins/CMakeLists.txt -index 8287f7be9..9a4db7be5 100644 ---- c/server/plugins/CMakeLists.txt -+++ w/server/plugins/CMakeLists.txt -@@ -199,7 +199,7 @@ if (SUPERNOVA) - - if(SNDFILE_FOUND) - target_include_directories(DiskIO_UGens_supernova PUBLIC ${SNDFILE_INCLUDE_DIR}) -- target_link_libraries(DiskIO_UGens_supernova ${SNDFILE_LIBRARIES} ${PTHREADS_LIBRARY} ${MATH_LIBRARY} ${Boost_THREAD_LIBRARY}) -+ target_link_libraries(DiskIO_UGens_supernova ${SNDFILE_LIBRARIES} ${PTHREADS_LIBRARY} ${MATH_LIBRARY} boost_thread_lib) - list(APPEND supernova_plugins DiskIO_UGens_supernova) - else() - message(SEND_ERROR "Cannot find libsndfile") -@@ -217,7 +217,7 @@ endforeach() - - if(NOT NO_X11) - foreach(ugen ${uiugens}) -- target_link_libraries(${ugen} ${Boost_THREAD_LIBRARY}) -+ target_link_libraries(${ugen} boost_thread_lib) - endforeach() - endif() - -diff --git c/server/scsynth/CMakeLists.txt w/server/scsynth/CMakeLists.txt -index 17c09f262..3a7145841 100644 ---- c/server/scsynth/CMakeLists.txt -+++ w/server/scsynth/CMakeLists.txt -@@ -176,11 +176,8 @@ elseif(AUDIOAPI STREQUAL coreaudio) - target_link_libraries(libscsynth "-framework CoreAudio") - endif() - --if (Boost_FOUND) -- target_link_libraries(libscsynth ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) --else() -- target_link_libraries(libscsynth boost_system boost_filesystem) --endif() -+target_link_libraries(libscsynth boost_system_lib boost_filesystem_lib) -+target_include_directories(libscsynth PUBLIC ${boost_include_dirs}) - - if (WIN32) - target_link_libraries(libscsynth wsock32 ws2_32 winmm) -diff --git c/server/supernova/CMakeLists.txt w/server/supernova/CMakeLists.txt -index cfe128880..2b80cb545 100644 ---- c/server/supernova/CMakeLists.txt -+++ w/server/supernova/CMakeLists.txt -@@ -70,7 +70,7 @@ if(NOT WIN32) - PROPERTY OUTPUT_NAME supernova) - endif() - --target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES} boost_thread) -+target_link_libraries(libsupernova oscpack tlsf ${PTHREADS_LIBRARIES} boost_thread_lib) - - target_compile_definitions(libsupernova PUBLIC SUPERNOVA) - target_include_directories(libsupernova PUBLIC -@@ -146,14 +146,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") - target_link_libraries(libsupernova rt) - endif() - -- --if(Boost_FOUND) -- target_link_libraries(libsupernova ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}) -- target_include_directories(libsupernova PUBLIC ${Boost_INCLUDE_DIRS}) --else() -- target_include_directories(libsupernova PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost) -- target_link_libraries(libsupernova boost_system boost_filesystem boost_program_options) --endif() -+target_link_libraries(libsupernova boost_system_lib boost_filesystem_lib boost_program_options_lib) -+target_include_directories(libsupernova PUBLIC ${boost_include_dirs}) - - if(CMAKE_COMPILER_IS_GNUCXX) - if( ${_gcc_version} VERSION_GREATER 5 ) -diff --git c/testsuite/server/CMakeLists.txt w/testsuite/server/CMakeLists.txt -index 38ce4b486..da19c2e5d 100644 ---- c/testsuite/server/CMakeLists.txt -+++ w/testsuite/server/CMakeLists.txt -@@ -1,8 +1,8 @@ -+add_library(boost_test STATIC boost_test.cpp) -+target_include_directories(boost_test PUBLIC ${boost_include_dirs}) -+ - add_subdirectory(scsynth) -- - if (SUPERNOVA) - add_subdirectory(supernova) - endif() - --add_library(boost_test STATIC boost_test.cpp) --target_include_directories(boost_test PUBLIC ${CMAKE_SOURCE_DIR}/external_libraries/boost) -diff --git c/testsuite/server/supernova/CMakeLists.txt w/testsuite/server/supernova/CMakeLists.txt -index e8a9ccf5f..4022da847 100644 ---- c/testsuite/server/supernova/CMakeLists.txt -+++ w/testsuite/server/supernova/CMakeLists.txt -@@ -34,7 +34,7 @@ foreach(test ${simple_tests}) - string(REPLACE .cpp "" test_name ${test} ) - add_executable(${test_name} ${test}) - -- target_link_libraries(${test_name} libsupernova boost_test boost_thread) -+ target_link_libraries(${test_name} libsupernova boost_test boost_thread_lib) - - add_test(${test_name}_run ${EXECUTABLE_OUTPUT_PATH}/${test_name}) - endforeach(test) |