From 72eeb77c85a66474fa513105b2e6451cf9727183 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 28 Apr 2021 11:44:47 +0100 Subject: [PATCH] Remove references to manipulation repo and point to github for deps --- CMakeLists.txt | 3 +-- scripts/target_post.cmake | 12 ++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0391687..55c2e50 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,6 @@ if(NOT SC_PATH) 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") if (APPLE) set(CMAKE_XCODE_GENERATE_SCHEME ON) @@ -68,7 +67,7 @@ set(FETCHCONTENT_QUIET FALSE) FetchContent_Declare( flucoma-core - GIT_REPOSITORY https://bitbucket.org/flucoma/fluid_decomposition.git + GIT_REPOSITORY https://github.com/flucoma/flucoma-core.git GIT_PROGRESS TRUE ) diff --git a/scripts/target_post.cmake b/scripts/target_post.cmake index cdc0910..cce9658 100644 --- a/scripts/target_post.cmake +++ b/scripts/target_post.cmake @@ -47,17 +47,12 @@ target_include_directories( PRIVATE "${LOCAL_INCLUDES}" "${FLUID_VERSION_PATH}" - "${FLUID_M_PATH}/include/" - "${FLUID_M_PATH}/thirdparty" ) -file(GLOB_RECURSE FLUID_MANIPULATION_HEADERS CONFIGURE_DEPENDS "${FLUID_M_PATH}/include/**/*.hpp") - file(GLOB_RECURSE FLUID_SC_HEADERS CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/include/wrapper/*.hpp") target_sources( - ${PLUGIN} PUBLIC ${FLUID_MANIPULATION_HEADERS} - ${FLUID_SC_HEADERS} + ${PLUGIN} PUBLIC ${FLUID_SC_HEADERS} ) target_include_directories( @@ -71,12 +66,9 @@ target_include_directories( get_property(HEADERS TARGET FLUID_DECOMPOSITION PROPERTY INTERFACE_SOURCES) source_group(TREE "${flucoma-core_SOURCE_DIR}/include" FILES ${HEADERS}) -source_group(TREE "${FLUID_M_PATH}/include" FILES ${FLUID_MANIPULATION_HEADERS}) source_group(TREE "${CMAKE_SOURCE_DIR}/include/wrapper" PREFIX wrapper FILES ${FLUID_SC_HEADERS}) -# get_property(HEADERS TARGET FLUID_MANIP PROPERTY INTERFACE_SOURCES) -# source_group(TREE "${fluid_manipulation_SOURCE_DIR}/include" FILES ${HEADERS}) -# + # if (SUPERNOVA) # target_include_directories( # ${PLUGIN}