Skip to content

Commit 1183168

Browse files
authored
chore(build): improve as dependency (#206)
1 parent b72fee5 commit 1183168

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

cmake/External.cmake

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# ------------------------------------------------------------------------------
55

66
# Copy the configuration
7-
configure_file(${CMAKE_SOURCE_DIR}/cmake/extern/ArduinoJson.txt.in
7+
configure_file(${CMAKE_INSTALL_PREFIX}/cmake/extern/ArduinoJson.txt.in
88
${EXTERNAL_LIBRARY_DIR}/arduinojson/CMakeLists.txt)
99

1010
# Configure the Cmake build
@@ -38,7 +38,7 @@ include_directories(${ARDUINO_JSON_SOURCE_DIR})
3838
# ------------------------------------------------------------------------------
3939

4040
# Copy the configuration
41-
configure_file(${CMAKE_SOURCE_DIR}/cmake/extern/BCL.txt.in
41+
configure_file(${CMAKE_INSTALL_PREFIX}/cmake/extern/BCL.txt.in
4242
${EXTERNAL_LIBRARY_DIR}/bcl/CMakeLists.txt)
4343

4444
# Configure the Cmake build
@@ -81,7 +81,7 @@ include_directories(${EXTERNAL_LIBRARY_DIR}/bcl/src/src)
8181
# ------------------------------------------------------------------------------
8282

8383
# Copy the configuration
84-
configure_file(${CMAKE_SOURCE_DIR}/cmake/extern/BIP66.txt.in
84+
configure_file(${CMAKE_INSTALL_PREFIX}/cmake/extern/BIP66.txt.in
8585
${EXTERNAL_LIBRARY_DIR}/bip66/CMakeLists.txt)
8686

8787
# Configure the Cmake build
@@ -115,7 +115,7 @@ include_directories(${EXTERNAL_LIBRARY_DIR}/bip66/src/)
115115
# ------------------------------------------------------------------------------
116116

117117
# Copy the configuration
118-
configure_file(${CMAKE_SOURCE_DIR}/cmake/extern/uECC.txt.in
118+
configure_file(${CMAKE_INSTALL_PREFIX}/cmake/extern/uECC.txt.in
119119
${EXTERNAL_LIBRARY_DIR}/uecc/CMakeLists.txt)
120120

121121
# Configure the Cmake build
@@ -158,4 +158,8 @@ set(EXTERNAL_LIBRARY_SOURCE
158158
${UECC_SOURCE}
159159
CACHE INTERNAL "External Lib Binary Files")
160160

161+
set(EXTERNAL_LIBRARY_INCLUDE
162+
${ARDUINO_JSON_SOURCE_DIR}
163+
CACHE INTERNAL "External Lib Include Dirs")
164+
161165
# ------------------------------------------------------------------------------

src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project(ark_cpp_crypto C CXX)
77
# External Libraries
88
# ------------------------------------------------------------------------------
99

10-
include(${CMAKE_SOURCE_DIR}/cmake/External.cmake)
10+
include(${CMAKE_INSTALL_PREFIX}/cmake/External.cmake)
1111

1212
# ------------------------------------------------------------------------------
1313

@@ -128,6 +128,7 @@ add_library(${PROJECT_NAME} STATIC
128128
# ------------------------------------------------------------------------------
129129

130130
set(ARK_CPP_CRYPTO_INCLUDE_DIRS
131+
${EXTERNAL_LIBRARY_INCLUDE}
131132
${PROJECT_SOURCE_DIR}
132133
${PROJECT_SOURCE_DIR}/include/cpp-crypto
133134
${PROJECT_SOURCE_DIR}/lib/

0 commit comments

Comments
 (0)