diff options
| author | Felix Herrmann <fherrmann@de.adit-jv.com> | 2020-05-26 10:16:39 +0200 |
|---|---|---|
| committer | Saya Sugiura <39760799+ssugiura@users.noreply.github.com> | 2020-07-06 10:04:07 +0900 |
| commit | 0f58751844c47ec12a966ac9aaab633c5750a10d (patch) | |
| tree | 7088e8ac195ec66eabbcbe0cd403d612037f7202 | |
| parent | 1354b34b9a6a07601cbdead06955cf150cf43d36 (diff) | |
| download | DLT-daemon-0f58751844c47ec12a966ac9aaab633c5750a10d.tar.gz | |
update cmake VERSION variables
align variable names with cmake 3.3 change.
=> DLT_VERSION* -> PROJECT_VERSION*
Signed-off-by: Felix Herrmann <fherrmann@de.adit-jv.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | automotive-dlt-c++.pc.in | 2 | ||||
| -rw-r--r-- | automotive-dlt.pc.in | 4 | ||||
| -rw-r--r-- | automotive-dlt.spec.in | 6 | ||||
| -rw-r--r-- | src/lib/CMakeLists.txt | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d4f2ff..017d4a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,7 +230,7 @@ endif() message(STATUS) message(STATUS "-------------------------------------------------------------------------------") -message(STATUS "Build for Version ${DLT_VERSION} build ${DLT_REVISION} version state ${DLT_VERSION_STATE}") +message(STATUS "Build for Version ${PROJECT_VERSION} build ${DLT_REVISION} version state ${DLT_VERSION_STATE}") message(STATUS "WITH_SYSTEMD = ${WITH_SYSTEMD}") message(STATUS "WITH_SYSTEMD_WATCHDOG = ${WITH_SYSTEMD_WATCHDOG}") message(STATUS "WITH_SYSTEMD_JOURNAL = ${WITH_SYSTEMD_JOURNAL}") diff --git a/automotive-dlt-c++.pc.in b/automotive-dlt-c++.pc.in index ef2eb22..895d943 100644 --- a/automotive-dlt-c++.pc.in +++ b/automotive-dlt-c++.pc.in @@ -3,6 +3,6 @@ includedir=${exec_prefix}/include Name: DLT C++ Description: Diagnostic Log and Trace C++ extensions -Version: @DLTCPP_VERSION@ +Version: @PROJECT_VERSION@ Requires: automotive-dlt Cflags: -std=gnu++0x diff --git a/automotive-dlt.pc.in b/automotive-dlt.pc.in index dedda39..bddd03b 100644 --- a/automotive-dlt.pc.in +++ b/automotive-dlt.pc.in @@ -20,8 +20,8 @@ includedir=${exec_prefix}/include Name: DLT Description: Diagnostic Log and Trace -Version: @DLT_VERSION@ +Version: @PROJECT_VERSION@ Requires: Libs: -L${libdir} -ldlt -lrt -lpthread @ZLIB_LIBRARY@ -Cflags: -I${includedir}/dlt -DDLT_@DLT_MAJOR_VERSION@_@DLT_MINOR_VERSION@ +Cflags: -I${includedir}/dlt -DDLT_@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@ diff --git a/automotive-dlt.spec.in b/automotive-dlt.spec.in index d950685..7f3df98 100644 --- a/automotive-dlt.spec.in +++ b/automotive-dlt.spec.in @@ -14,7 +14,7 @@ ####### Name: @PROJECT_NAME@ -Version: @DLT_VERSION@ +Version: @PROJECT_VERSION@ Release: @GENIVI_RPM_RELEASE@ Summary: %{name} - Diagnostic Log and Trace Group: System Environment/Base @@ -108,8 +108,8 @@ rm -rf $RPM_BUILD_ROOT /etc/dlt.conf /usr/share/dlt-filetransfer/dlt-test-filetransfer-file /usr/share/dlt-filetransfer/dlt-test-filetransfer-image.png -%{_libdir}/libdlt.so.@DLT_MAJOR_VERSION@ -%{_libdir}/libdlt.so.@DLT_VERSION@ +%{_libdir}/libdlt.so.@PROJECT_VERSION_MAJOR@ +%{_libdir}/libdlt.so.@PROJECT_VERSION@ %{_libdir}/libdlt.so %{_bindir}/dlt-system %{_bindir}/dlt-convert diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index e99cacc..b28b7af 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -45,7 +45,7 @@ else() endif() target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) -set_target_properties(dlt PROPERTIES VERSION ${DLT_VERSION} SOVERSION ${DLT_MAJOR_VERSION}) +set_target_properties(dlt PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) install(TARGETS dlt RUNTIME |