Skip to content

Commit 29fb84e

Browse files
committed
Move thirdparty dependencies from fpga to top-level directory
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
1 parent fa38aa7 commit 29fb84e

File tree

10 files changed

+10
-6085
lines changed

10 files changed

+10
-6085
lines changed

.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SPDX-FileCopyrightText: 2014-2023 Institute for Automation of Complex Power Systems, RWTH Aachen University
22
# SPDX-License-Identifier: Apache-2.0
33

4-
[submodule "fpga/thirdparty/libxil"]
5-
path = fpga/thirdparty/libxil
4+
[submodule "thirdparty/libxil"]
5+
path = thirdparty/libxil
66
url = https://github.com/VILLASframework/libxil.git
7-
[submodule "fpga/thirdparty/udmabuf"]
8-
path = fpga/thirdparty/udmabuf
7+
[submodule "thirdparty/udmabuf"]
8+
path = thirdparty/udmabuf
99
url = https://github.com/ikwzm/udmabuf

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ endif()
148148
FindSymbol(${LWS_LOCATION} lws_extension_callback_pm_deflate LWS_DEFLATE_FOUND)
149149

150150
# Check if submodules for VILLASfpga are present
151-
if(EXISTS "${PROJECT_SOURCE_DIR}/fpga/thirdparty/libxil/CMakeLists.txt")
151+
if(EXISTS "${PROJECT_SOURCE_DIR}/thirdparty/libxil/CMakeLists.txt")
152152
set(FOUND_FPGA_SUBMODULES ON)
153153
else()
154154
set(FOUND_FPGA_SUBMODULES OFF)

fpga/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ pkg_check_modules(JANSSON REQUIRED IMPORTED_TARGET jansson)
1313
find_package(Threads)
1414
find_package(Criterion)
1515

16-
include_directories(thirdparty/CLI11)
17-
include_directories(thirdparty/rang)
16+
include_directories(../thirdparty/CLI11)
17+
include_directories(../thirdparty/rang)
1818

19-
add_subdirectory(thirdparty/libxil)
19+
add_subdirectory(../thirdparty/libxil)
2020
add_subdirectory(lib)
2121
add_subdirectory(src)
2222

0 commit comments

Comments
 (0)