Skip to content

Commit 3e6edf1

Browse files
committed
submodule cleanup
1 parent b283686 commit 3e6edf1

File tree

5 files changed

+5
-17
lines changed

5 files changed

+5
-17
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "libs/cnkalman"]
2-
path = libs/cnkalman
3-
url = ../cnkalman.git
1+
[submodule "libs/cnkalman/libs/pybind11"]
2+
path = libs/cnkalman/libs/pybind11
3+
url = [email protected]:pybind/pybind11.git

CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,7 @@ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
188188
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
189189
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
190190

191-
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libs/cnkalman/CMakeLists.txt")
192-
find_program(GIT git)
193-
message("Submodule seems empty; populating...")
194-
execute_process(COMMAND ${GIT} submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
195-
endif()
196-
191+
add_subdirectory(libs/cnmatrix)
197192
add_subdirectory(libs/cnkalman)
198193

199194
add_subdirectory(redist)

libs/cnkalman/.gitmodules

Lines changed: 0 additions & 6 deletions
This file was deleted.

libs/cnkalman/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ else()
3232
message("Can't use sciplot...")
3333
endif()
3434

35-
add_subdirectory(libs/cnmatrix)
3635
add_subdirectory(libs/pybind11)
36+
3737
add_subdirectory(src)
3838

3939
set(cnkalman_root_source_dir ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")

libs/cnkalman/libs/cnmatrix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)