Remove references to manipulation repo and point to github for deps

nix
Owen Green 5 years ago
parent 4b83ed0f5a
commit 72eeb77c85

@ -19,7 +19,6 @@ if(NOT SC_PATH)
endif() endif()
set(FLUID_PATH "" CACHE PATH "Optional path to the Fluid Decomposition repo") 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) if (APPLE)
set(CMAKE_XCODE_GENERATE_SCHEME ON) set(CMAKE_XCODE_GENERATE_SCHEME ON)
@ -68,7 +67,7 @@ set(FETCHCONTENT_QUIET FALSE)
FetchContent_Declare( FetchContent_Declare(
flucoma-core flucoma-core
GIT_REPOSITORY https://bitbucket.org/flucoma/fluid_decomposition.git GIT_REPOSITORY https://github.com/flucoma/flucoma-core.git
GIT_PROGRESS TRUE GIT_PROGRESS TRUE
) )

@ -47,17 +47,12 @@ target_include_directories(
PRIVATE PRIVATE
"${LOCAL_INCLUDES}" "${LOCAL_INCLUDES}"
"${FLUID_VERSION_PATH}" "${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") file(GLOB_RECURSE FLUID_SC_HEADERS CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/include/wrapper/*.hpp")
target_sources( target_sources(
${PLUGIN} PUBLIC ${FLUID_MANIPULATION_HEADERS} ${PLUGIN} PUBLIC ${FLUID_SC_HEADERS}
${FLUID_SC_HEADERS}
) )
target_include_directories( target_include_directories(
@ -71,12 +66,9 @@ target_include_directories(
get_property(HEADERS TARGET FLUID_DECOMPOSITION PROPERTY INTERFACE_SOURCES) get_property(HEADERS TARGET FLUID_DECOMPOSITION PROPERTY INTERFACE_SOURCES)
source_group(TREE "${flucoma-core_SOURCE_DIR}/include" FILES ${HEADERS}) 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}) 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) # if (SUPERNOVA)
# target_include_directories( # target_include_directories(
# ${PLUGIN} # ${PLUGIN}

Loading…
Cancel
Save