From 289cf6381d7b85159f38cce28f58f7f955a9745b Mon Sep 17 00:00:00 2001 From: Owen Green Date: Mon, 27 Apr 2020 17:54:06 +0100 Subject: [PATCH 1/8] Update macOS target to 10.8 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3e4ba6..0f8de2c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ set(FLUID_PATH "" CACHE PATH "Optional path to the Fluid Decomposition repo") if (APPLE) set(CMAKE_OSX_ARCHITECTURES x86_64) set(CMAKE_XCODE_GENERATE_SCHEME ON) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8) endif() ################################################################################ From 795c78b96fb7f93e05a85fec24de3f69cea2d1c7 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Mon, 27 Apr 2020 21:36:46 +0100 Subject: [PATCH 2/8] Update CMake project name --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f8de2c..6080acd 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) From 875deadfd93124b38db3d39fd12c3191aba915c4 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Mon, 27 Apr 2020 21:36:52 +0100 Subject: [PATCH 3/8] Update distribution license filename --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6080acd..188b7a2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,4 +118,4 @@ endforeach() install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ DESTINATION ${SC_PACKAGE_ROOT}/plugins PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles" DESTINATION ${SC_PACKAGE_ROOT}) install(FILES QuickStart.md DESTINATION ${SC_PACKAGE_ROOT}) -install(FILES ${fluid_decomposition_SOURCE_DIR}/license-executableform.md DESTINATION ${SC_PACKAGE_ROOT} RENAME license.md) +install(FILES ${fluid_decomposition_SOURCE_DIR}/distribution-license.md DESTINATION ${SC_PACKAGE_ROOT} RENAME LICENSE.md) From 5e1a0e989cf36f8befc791bca0091668565b39b7 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Mon, 27 Apr 2020 22:06:29 +0100 Subject: [PATCH 4/8] Further update to distribution license filename --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 188b7a2..670b834 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,4 +118,4 @@ endforeach() install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ DESTINATION ${SC_PACKAGE_ROOT}/plugins PATTERN "*.ilk" EXCLUDE PATTERN "*.PDB" EXCLUDE) install(DIRECTORY "${fluid_decomposition_SOURCE_DIR}/AudioFiles" DESTINATION ${SC_PACKAGE_ROOT}) install(FILES QuickStart.md DESTINATION ${SC_PACKAGE_ROOT}) -install(FILES ${fluid_decomposition_SOURCE_DIR}/distribution-license.md DESTINATION ${SC_PACKAGE_ROOT} RENAME LICENSE.md) +install(FILES ${fluid_decomposition_SOURCE_DIR}/distribution.lic DESTINATION ${SC_PACKAGE_ROOT} RENAME LICENSE.md) From 38753aab74626ba93072937ea149782b8f82205f Mon Sep 17 00:00:00 2001 From: Owen Green Date: Mon, 27 Apr 2020 22:14:52 +0100 Subject: [PATCH 5/8] Update README links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 098d821..128b5b0 100644 --- a/README.md +++ b/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) From 0fd5e6dfdd22752b3914ef5fb8a6ddc488272670 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Mon, 27 Apr 2020 22:18:29 +0100 Subject: [PATCH 6/8] Update copyright year --- license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/license.md b/license.md index a17c640..e0c0ffc 100644 --- a/license.md +++ b/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 From 0c71eb8bdc33f91893e5f9af76b6f26ae81dd2ad Mon Sep 17 00:00:00 2001 From: Owen Green Date: Mon, 27 Apr 2020 22:21:41 +0100 Subject: [PATCH 7/8] Upper case LICENSE --- license.md => LICENSE.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename license.md => LICENSE.md (100%) diff --git a/license.md b/LICENSE.md similarity index 100% rename from license.md rename to LICENSE.md From e1360458345cb71bda1423cdb098cb51d54a2b86 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Tue, 28 Apr 2020 13:29:18 +0100 Subject: [PATCH 8/8] Update dependency paths and URLs --- CMakeLists.txt | 37 ++++++++++++++++++++++--------------- scripts/target_post.cmake | 2 +- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 670b834..26c76fb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,15 +11,14 @@ 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) message(FATAL_ERROR "SuperCollider source path is not set") endif() -set(FLUID_PATH "" CACHE PATH "Optional path to the Fluid Decomposition repo") -# set(FLUID_M_PATH "" CACHE PATH "Optional path to the Fluid fluid_manipulation repo") +set(FLUID_PATH "" CACHE PATH "Optional path to the flucoma-core repo") if (APPLE) set(CMAKE_OSX_ARCHITECTURES x86_64) @@ -49,21 +48,21 @@ include(FetchContent) set(FETCHCONTENT_QUIET FALSE) FetchContent_Declare( - fluid_decomposition - GIT_REPOSITORY https://bitbucket.org/flucoma/fluid_decomposition.git + flucoma-core + GIT_REPOSITORY https://github.com/flucoma/flucoma-core.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) -if(NOT fluid_decomposition_POPULATED) - FetchContent_Populate(fluid_decomposition) - add_subdirectory(${fluid_decomposition_SOURCE_DIR} ${fluid_decomposition_BINARY_DIR}) +FetchContent_GetProperties(flucoma-core) +if(NOT flucoma-core_POPULATED) + FetchContent_Populate(flucoma-core) + add_subdirectory(${flucoma-core_SOURCE_DIR} ${flucoma-core_BINARY_DIR}) include(flucoma_version) include(flucoma-buildtools) endif() @@ -112,10 +111,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 "${fluid_decomposition_SOURCE_DIR}/AudioFiles" DESTINATION ${SC_PACKAGE_ROOT}) -install(FILES QuickStart.md DESTINATION ${SC_PACKAGE_ROOT}) -install(FILES ${fluid_decomposition_SOURCE_DIR}/distribution.lic DESTINATION ${SC_PACKAGE_ROOT} RENAME LICENSE.md) +install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ + DESTINATION ${SC_PACKAGE_ROOT}/plugins + PATTERN "*.ilk" EXCLUDE + 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) diff --git a/scripts/target_post.cmake b/scripts/target_post.cmake index f2c4198..e70c088 100644 --- a/scripts/target_post.cmake +++ b/scripts/target_post.cmake @@ -65,7 +65,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})