summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2020-12-02 13:21:43 +0100
committerSimon Rettberg2020-12-02 13:21:43 +0100
commit0b77a35fb31b1e0141f824b1b7a22c1db1797ec9 (patch)
tree4504b41770cab84b13e90a51470ba4f4c02eb3e3
parent[BUILD] Include branch and build timestamp in binaries (diff)
downloaddnbd3-0b77a35fb31b1e0141f824b1b7a22c1db1797ec9.tar.gz
dnbd3-0b77a35fb31b1e0141f824b1b7a22c1db1797ec9.tar.xz
dnbd3-0b77a35fb31b1e0141f824b1b7a22c1db1797ec9.zip
[BUILD] Fix dnbd3-client build, Fix source-only build
-rw-r--r--cmake/Version.cmake2
-rw-r--r--src/client/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 75e99e3..9beb338 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -36,7 +36,7 @@ macro(get_repository_version REPOSITORY_VERSION VERSION_HEADER_FILE VERSION_BUIL
if(EXISTS ${VERSION_HEADER_FILE})
# get version information from the generated version header of the source package
file(READ ${VERSION_HEADER_FILE} GIT_VERSION)
- string(REGEX MATCH "DNBD3_VERSION\s+\"([0-9][A-Za-z0-9.+~-]*)\"" GIT_VERSION ${GIT_VERSION})
+ string(REGEX MATCH "DNBD3_VERSION[ \t]+\"([0-9][A-Za-z0-9.+~-]*)\"" GIT_VERSION ${GIT_VERSION})
set(GIT_VERSION "${CMAKE_MATCH_1}")
else(EXISTS ${VERSION_HEADER_FILE})
# get detailed Git version information from Git repository
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 2ab1971..29dcdb4 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -8,6 +8,6 @@ project(dnbd3-client
add_definitions(-D_GNU_SOURCE)
add_executable(dnbd3-client ${CMAKE_CURRENT_SOURCE_DIR}/client.c)
-target_link_libraries(dnbd3-client dnbd3-version dnbd3-shared)
+target_link_libraries(dnbd3-client dnbd3-version dnbd3-build dnbd3-shared)
install(TARGETS dnbd3-client RUNTIME DESTINATION bin
COMPONENT kernel)