From 8f36e73b18c22ee4cd57caaa985360213e006ebe Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Tue, 26 Sep 2023 01:27:13 -0400 Subject: [PATCH] build: remove submodules (moved to reflect-sm project) --- .gitmodules | 9 ---- CMakeLists.txt | 85 -------------------------------------- repo/README.md | 5 --- repo/refcnt | 1 - repo/subsys | 1 - src/reflect/CMakeLists.txt | 6 ++- 6 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 .gitmodules delete mode 100644 repo/README.md delete mode 160000 repo/refcnt delete mode 160000 repo/subsys diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index ebcf3a2..0000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "repo/indentlog"] - path = repo/indentlog - url = git@github.com:Rconybea/indentlog.git -[submodule "repo/refcnt"] - path = repo/refcnt - url = git@github.com:Rconybea/refcnt.git -[submodule "repo/subsys"] - path = repo/subsys - url = git@github.com:Rconybea/subsys.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f777c5..078681e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,91 +41,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) # always write compile_commands.json set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "") -# ---------------------------------------------------------------- -# external projects (need these to exist before add_subdirectory() below) -# -# we are expecting these projects to coexist peacefully in build/local -# (i.e. can run their `make install` steps independently with prefix build/local, -# without any collisions) -# - -include(ExternalProject) - -## ----- indentlog ------ - -# NOTE: we could have cmake handle git interaction, -# but we want source for certain dependencies to live in a location -# that's suitable for accepting changes + coordinated commits. -# In particular, not in the build directory! -# -externalproject_add( - project_indentlog - SOURCE_DIR ${PROJECT_SOURCE_DIR}/repo/indentlog - BINARY_DIR ${PROJECT_BINARY_DIR}/ext/indentlog - INSTALL_DIR ${PROJECT_BINARY_DIR}/local - CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCODE_COVERAGE=${CODE_COVERAGE} -DCMAKE_PREFIX_PATH= -DCMAKE_INSTALL_PREFIX= - BUILD_COMMAND make - INSTALL_COMMAND make install - TEST_BEFORE_INSTALL True -) - -add_library(indentlog INTERFACE IMPORTED) -#set_property(TARGET indentlog PROPERTY IMPORTED_LOCATION ${PROJECT_BINARY_DIR}/local/lib/libindentlog.so) -add_dependencies(indentlog project_indentlog) - -# runs ctest in indentlog build dir -add_test(NAME indentlog COMMAND ${PROJECT_SOURCE_DIR}/cmake/run-external-ctest ${PROJECT_BINARY_DIR}/ext/indentlog) -#target_code_coverage(indentlog EXTERNAL AUTO ALL) - -# ----- subsys ----- - -externalproject_add( - project_subsys - SOURCE_DIR ${PROJECT_SOURCE_DIR}/repo/subsys - BINARY_DIR ${PROJECT_BINARY_DIR}/ext/subsys - INSTALL_DIR ${PROJECT_BINARY_DIR}/local - CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCODE_COVERAGE=${CODE_COVERAGE} -DCMAKE_PREFIX_PATH= -DCMAKE_INSTALL_PREFIX= - BUILD_COMMAND make - INSTALL_COMMAND make install - TEST_BEFORE_INSTALL True -) - -add_library(subsys INTERFACE IMPORTED) -add_dependencies(subsys project_subsys) - -# runs ctest in subsys build dir -add_test(NAME subsys COMMAND ${PROJECT_SOURCE_DIR}/cmake/run-external-ctest ${PROJECT_BINARY_DIR}/ext/subsys) - -# ----- refcnt ----- - -# CMAKE_ARGS -# CMAKE_BUILD_TYPE propagate Debug/Release build type -# CODE_COVERAGE propagate code coverage setting -# CMAKE_PREFIX_PATH path for support cmake files of dependencies (needed for find_package() to work) -# CMAKE_INSTALL_PREFIX install subproject here -# SOURCE_DIR -- where to find already established source code -# BINARY_DIR -- run build for external project here -# INSTALL_DIR -- (temporarily) install external project here -# -externalproject_add( - project_refcnt - SOURCE_DIR ${PROJECT_SOURCE_DIR}/repo/refcnt - BINARY_DIR ${PROJECT_BINARY_DIR}/ext/refcnt - INSTALL_DIR ${PROJECT_BINARY_DIR}/local - CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCODE_COVERAGE=${CODE_COVERAGE} -DCMAKE_PREFIX_PATH= -DCMAKE_INSTALL_PREFIX= - BUILD_COMMAND make - INSTALL_COMMAND make install - TEST_BEFORE_INSTALL True -) - -add_library(refcnt SHARED IMPORTED) -set_property(TARGET refcnt PROPERTY IMPORTED_LOCATION ${PROJECT_BINARY_DIR}/local/lib/librefcnt.so) -add_dependencies(refcnt project_refcnt) -add_dependencies(refcnt project_indentlog) - -# runs ctest in refcnt build dir -add_test(NAME refcnt COMMAND ${PROJECT_SOURCE_DIR}/cmake/run-external-ctest ${PROJECT_BINARY_DIR}/ext/refcnt) - # ---------------------------------------------------------------- # sources diff --git a/repo/README.md b/repo/README.md deleted file mode 100644 index 3acdcde..0000000 --- a/repo/README.md +++ /dev/null @@ -1,5 +0,0 @@ - -``` -cd reflect/repo -git submodule add git@github.com/someusername/someproject.git -``` diff --git a/repo/refcnt b/repo/refcnt deleted file mode 160000 index 4b3c854..0000000 --- a/repo/refcnt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4b3c854fc7872ba404ce4e0af25ecfdc47822ae1 diff --git a/repo/subsys b/repo/subsys deleted file mode 160000 index 1c384e1..0000000 --- a/repo/subsys +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c384e1ff0a01885bdf0713be858085814b6ece6 diff --git a/src/reflect/CMakeLists.txt b/src/reflect/CMakeLists.txt index e1c1f65..799cd10 100644 --- a/src/reflect/CMakeLists.txt +++ b/src/reflect/CMakeLists.txt @@ -25,7 +25,8 @@ xo_install_library(${SELF_LIBRARY_NAME}) #xo_refcnt_dependency(${SELF_LIBRARY_NAME}) #xo_indentlog_dependency(${SELF_LIBRARY_NAME}) -add_dependencies(${SELF_LIBRARY_NAME} refcnt) +find_package(refcnt REQUIRED) +#add_dependencies(${SELF_LIBRARY_NAME} refcnt) target_include_directories( ${SELF_LIBRARY_NAME} PUBLIC $ @@ -33,7 +34,8 @@ target_include_directories( ) target_link_libraries(${SELF_LIBRARY_NAME} PUBLIC refcnt) -add_dependencies(${SELF_LIBRARY_NAME} indentlog) +find_package(indentlog REQUIRED) +#add_dependencies(${SELF_LIBRARY_NAME} indentlog) # note: can't use find_package() here, # because find_package() needs to run successfully before # dependency gets installed.