Skip to content

Commit b9cce95

Browse files
Merge remote-tracking branch 'origin/develop' into HEAD
2 parents 76e5234 + a192e08 commit b9cce95

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,9 @@ if(WIN32)
162162
set(depthai_dll_libraries "$<TARGET_RUNTIME_DLLS:${TARGET_NAME}>")
163163
endif()
164164
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND
165-
${CMAKE_COMMAND} -E copy ${depthai_dll_libraries} $<TARGET_FILE_DIR:${TARGET_NAME}>
165+
"$<$<BOOL:${depthai_dll_libraries}>:${CMAKE_COMMAND};-E;copy_if_different;${depthai_dll_libraries};$<TARGET_FILE_DIR:${TARGET_NAME}>>"
166166
COMMAND_EXPAND_LISTS
167+
VERBATIM
167168
)
168169

169170
# Disable "d" postfix, so python can import the library as is

find_version.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
def get_version_from_cmake_lists(path):
1313
with open(path, 'r') as file:
1414
content = file.read()
15-
match = re.search(cmake_lists_txt_version_pattern, content, flags=re.IGNORECASE)
15+
match = re.search(cmake_lists_txt_version_pattern, content, flags=re.IGNORECASE)
1616
ver1 = match.group('ver1')
1717
ver2 = match.group('ver2')
1818
version = ver1
@@ -21,7 +21,7 @@ def get_version_from_cmake_lists(path):
2121
return version
2222

2323
def get_package_version():
24-
24+
2525
version_core = '0.0.0'
2626
version_revision = '0'
2727
version_core = get_version_from_cmake_lists(version_depthai_core_path)
@@ -32,4 +32,4 @@ def get_package_version():
3232

3333

3434
def get_package_dev_version(commit_hash):
35-
return get_package_version() + ".dev+" + commit_hash
35+
return get_package_version() + ".dev0+" + commit_hash

0 commit comments

Comments
 (0)