Skip to content

Commit 6be90d8

Browse files
committed
Set proper build dir for Tiny-Can
1 parent 993923b commit 6be90d8

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

cmake/deps.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ if(WIN32)
155155
# Tiny-Can
156156
set(TINYCAN_VERSION "8.12")
157157

158+
set(TINYCAN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/deps/TinyCan")
159+
set(TINYCAN_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/TinyCan_devel-prefix/src/TinyCan_devel-build")
160+
158161
set(TINYCAN_DEVEL_PKG TinyCan_v${TINYCAN_VERSION}.zip)
159162
set(TINYCAN_DEVEL_URL https://canopenterm.de/mirror)
160163
set(TINYCAN_DEVEL_HASH c047e901ccb34bc764fb5dc5f2359dad82ff55c4)
@@ -167,18 +170,18 @@ if(WIN32)
167170
DOWNLOAD_EXTRACT_TIMESTAMP true
168171
TLS_VERIFY true
169172
SOURCE_DIR ${TINYCAN_PATH}/
170-
BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/mhstcan.dll"
173+
BUILD_BYPRODUCTS ${TINYCAN_BUILD_DIR}/mhstcan.lib
171174

172175
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy
173-
"${CMAKE_CURRENT_BINARY_DIR}/TinyCan_devel-prefix/src/TinyCan_devel-build/mhstcan.dll"
176+
${TINYCAN_BUILD_DIR}/mhstcan.dll
174177
${CMAKE_CURRENT_BINARY_DIR}/
175178

176179
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
177180
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/dep_TinyCan.cmake" ${TINYCAN_PATH}/CMakeLists.txt
178181
)
179182

180183
set(TINYCAN_INCLUDE_DIR "${TINYCAN_PATH}/dev/lib")
181-
set(TINYCAN_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/TinyCan_devel-prefix/src/TinyCan_devel-build/mhstcan.lib")
184+
set(TINYCAN_LIBRARY ${TINYCAN_BUILD_DIR}/mhstcan.lib)
182185

183186
set(PLATFORM_DEPS
184187
Ixxat_devel

0 commit comments

Comments
 (0)