Merge branch 'master' into clients/inter_client_comms

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.11)
 # Paths
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/install" CACHE PATH "")
 
-set(SC_LIBRARY_OUTPUT_PREFIX "release-packaging" CACHE STRING "Where in the hierarchy to write sc plugins (different for superbuild)")
+set(SC_LIBRARY_OUTPUT_PREFIX "release-packaging" CACHE STRING "Where in the hierarchy to write sc plugins")
 
 set(SC_PATH "" CACHE PATH "Path to the top of SuperCollider source tree")
 if(NOT SC_PATH)
@@ -29,7 +29,7 @@ endif()
 
 ################################################################################
 # Main project
-project (fluid_decomposition_supercollider LANGUAGES CXX)
+project (flucoma-sc LANGUAGES CXX)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY ON)
 
@@ -49,21 +49,21 @@ include(FetchContent)
 set(FETCHCONTENT_QUIET FALSE)
 
 FetchContent_Declare(
-  fluid_decomposition
+  flucoma-core
   GIT_REPOSITORY https://bitbucket.org/flucoma/fluid_decomposition.git
   GIT_PROGRESS TRUE
 )
 
 if(FLUID_PATH)
   get_filename_component(
-    FETCHCONTENT_SOURCE_DIR_FLUID_DECOMPOSITION ${FLUID_PATH} ABSOLUTE
+    FETCHCONTENT_SOURCE_DIR_FLUCOMA-CORE ${FLUID_PATH} ABSOLUTE
   )
 endif()
 
-FetchContent_GetProperties(fluid_decomposition)
+FetchContent_GetProperties(flucoma-core)
-if(NOT fluid_decomposition_POPULATED)
+if(NOT flucoma-core_POPULATED)
-  FetchContent_Populate(fluid_decomposition)
+  FetchContent_Populate(flucoma-core)
-  add_subdirectory(${fluid_decomposition_SOURCE_DIR} ${fluid_decomposition_BINARY_DIR})
+  add_subdirectory(${flucoma-core_SOURCE_DIR} ${flucoma-core_BINARY_DIR})
   include(flucoma_version)
   include(flucoma-buildtools)
 endif()
@@ -112,10 +112,18 @@ set(FLUID_PACKAGE_NAME FluidCorpusManipulation CACHE STRING "Name for published
 set(SC_PACKAGE_ROOT ${SC_INSTALL_PREFIX}/${FLUID_PACKAGE_NAME})
 
 foreach(PACKAGE_DIRECTORY Classes;HelpSource;Examples)
-  install(DIRECTORY "release-packaging/${PACKAGE_DIRECTORY}" DESTINATION ${SC_PACKAGE_ROOT})
+  install(DIRECTORY "release-packaging/${PACKAGE_DIRECTORY}" 
+          DESTINATION ${SC_PACKAGE_ROOT})
 endforeach()
 
-install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ DESTINATION ${SC_PACKAGE_ROOT}/plugins PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE)
+install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ 
-install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles" DESTINATION ${SC_PACKAGE_ROOT})
+        DESTINATION ${SC_PACKAGE_ROOT}/plugins 
-install(FILES QuickStart.md DESTINATION ${SC_PACKAGE_ROOT})
+        PATTERN "*.ilk" EXCLUDE 
-install(FILES ${fluid_decomposition_SOURCE_DIR}/license-executableform.md DESTINATION ${SC_PACKAGE_ROOT} RENAME license.md)
+        PATTERN "*.PDB" EXCLUDE)
+install(DIRECTORY "${flucoma-core_SOURCE_DIR}/AudioFiles" 
+        DESTINATION ${SC_PACKAGE_ROOT})
+install(FILES QuickStart.md 
+        DESTINATION ${SC_PACKAGE_ROOT})
+install(FILES ${flucoma-core_SOURCE_DIR}/distribution.lic 
+        DESTINATION ${SC_PACKAGE_ROOT} 
+        RENAME LICENSE.md)

LICENSE.md

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017-2019 University of Huddersfield
+Copyright (c) 2017-2020 University of Huddersfield
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -1,6 +1,6 @@
 # Fluid Corpus Manipulation: SuperCollider Objects Library
 
-This repository hosts code for generating the SC objects and documentation resources for the Fluid Corpus Manipulation Project. Much of the actual code that does the exciting stuff lives in this repository's principal dependency, the [Fluid Corpus Manipulation Library]().
+This repository hosts code for generating the SC objects and documentation resources for the Fluid Corpus Manipulation Project. Much of the actual code that does the exciting stuff lives in this repository's principal dependency, the [Fluid Corpus Manipulation Library](https://github.com/flucoma/flucoma-core).
 
 ## Pre-requisites
 
@@ -13,7 +13,7 @@ This repository hosts code for generating the SC objects and documentation resou
 
 These will be downloaded and configured automatically, unless you pass CMake a source code location on disk for each (see below):
 
-- [Fluid Corpus Manipulation Library]()
+- [Fluid Corpus Manipulation Library](https://github.com/flucoma/flucoma-core)
 - [Eigen](https://gitlab.com/libeigen/eigen) (3.3.5)
 - [HISSTools Library](https://github.com/AlexHarker/HISSTools_Library)
 

scripts/target_post.cmake

@@ -73,7 +73,7 @@ target_include_directories(
 )
 
 get_property(HEADERS TARGET FLUID_DECOMPOSITION PROPERTY INTERFACE_SOURCES)
-source_group(TREE "${fluid_decomposition_SOURCE_DIR}/include" FILES ${HEADERS})
+source_group(TREE "${flucoma-core_SOURCE_DIR}/include" FILES ${HEADERS})
 
 # get_property(HEADERS TARGET FLUID_MANIP PROPERTY INTERFACE_SOURCES)
 # source_group(TREE "${fluid_manipulation_SOURCE_DIR}/include" FILES ${HEADERS})