diff options
| author | 2009-08-26 03:56:56 +0200 | |
|---|---|---|
| committer | 2009-08-26 03:56:56 +0200 | |
| commit | 3c173016e870f45814b508fe11aafc581b6107c6 (patch) | |
| tree | 882d4627b1e53c2d1739973eabc717f1d986c8a5 | |
| parent | 351f455dab10cac32e15ca157f9b17876becf5ee (diff) | |
| download | usbmuxd-3c173016e870f45814b508fe11aafc581b6107c6.tar.gz usbmuxd-3c173016e870f45814b508fe11aafc581b6107c6.tar.bz2 | |
Add version information.
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | daemon/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | daemon/main.c | 2 | ||||
| -rw-r--r-- | libusbmuxd/CMakeLists.txt | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f7ebc1..b995967 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | PROJECT(usbmuxd) | 1 | PROJECT(usbmuxd) |
| 2 | 2 | ||
| 3 | SET ( USBMUXD_VERSION_MAJOR "1" ) | ||
| 4 | SET ( USBMUXD_VERSION_MINOR "0" ) | ||
| 5 | SET ( LIBUSBMUXD_SOVERSION "0" ) | ||
| 6 | SET ( USBMUXD_VERSION "${USBMUXD_VERSION_MAJOR}.${USBMUXD_VERSION_MINOR}" ) | ||
| 7 | SET ( LIBUSBMUXD_VERSION "${LIBUSBMUXD_SOVERSION}.${USBMUXD_VERSION}" ) | ||
| 8 | |||
| 3 | cmake_minimum_required(VERSION 2.6) | 9 | cmake_minimum_required(VERSION 2.6) |
| 4 | 10 | ||
| 5 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules/") | 11 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Modules/") |
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 45565d1..e5f9b11 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt | |||
| @@ -25,7 +25,7 @@ Please apply the patch in the contrib/ directory to your libusb 1.0 tree. | |||
| 25 | add_definitions(-DEXPLICIT_ZLP_TRANSACTION) | 25 | add_definitions(-DEXPLICIT_ZLP_TRANSACTION) |
| 26 | endif(NOT HAVE_LIBUSB_ZLP) | 26 | endif(NOT HAVE_LIBUSB_ZLP) |
| 27 | 27 | ||
| 28 | add_definitions(-Wall -O2 -g -DUSBMUXD_DAEMON) | 28 | add_definitions(-Wall -O2 -g -DUSBMUXD_DAEMON -DUSBMUXD_VERSION="${USBMUXD_VERSION}") |
| 29 | add_executable(usbmuxd main.c usb-linux.c log.c ../common/utils.c device.c client.c) | 29 | add_executable(usbmuxd main.c usb-linux.c log.c ../common/utils.c device.c client.c) |
| 30 | target_link_libraries(usbmuxd ${LIBS}) | 30 | target_link_libraries(usbmuxd ${LIBS}) |
| 31 | 31 | ||
diff --git a/daemon/main.c b/daemon/main.c index dde99c2..ef98e75 100644 --- a/daemon/main.c +++ b/daemon/main.c | |||
| @@ -389,7 +389,7 @@ int main(int argc, char *argv[]) | |||
| 389 | /* set log level to specified verbosity */ | 389 | /* set log level to specified verbosity */ |
| 390 | log_level = verbose; | 390 | log_level = verbose; |
| 391 | 391 | ||
| 392 | usbmuxd_log(LL_NOTICE, "usbmux v0.1 starting up"); | 392 | usbmuxd_log(LL_NOTICE, "usbmux v%s starting up", USBMUXD_VERSION); |
| 393 | should_exit = 0; | 393 | should_exit = 0; |
| 394 | 394 | ||
| 395 | set_signal_handlers(); | 395 | set_signal_handlers(); |
diff --git a/libusbmuxd/CMakeLists.txt b/libusbmuxd/CMakeLists.txt index accdbc4..cb0d259 100644 --- a/libusbmuxd/CMakeLists.txt +++ b/libusbmuxd/CMakeLists.txt | |||
| @@ -6,6 +6,8 @@ add_library (libusbmuxd SHARED libusbmuxd.c sock_stuff.c ../common/utils.c) | |||
| 6 | # But we can't use that due to the conflict with the usbmuxd daemon, | 6 | # But we can't use that due to the conflict with the usbmuxd daemon, |
| 7 | # so instead change the library output base name to usbmuxd here | 7 | # so instead change the library output base name to usbmuxd here |
| 8 | set_target_properties(libusbmuxd PROPERTIES OUTPUT_NAME usbmuxd) | 8 | set_target_properties(libusbmuxd PROPERTIES OUTPUT_NAME usbmuxd) |
| 9 | set_target_properties(libusbmuxd PROPERTIES VERSION ${LIBUSBMUXD_VERSION}) | ||
| 10 | set_target_properties(libusbmuxd PROPERTIES SOVERSION ${LIBUSBMUXD_VERSION}) | ||
| 9 | 11 | ||
| 10 | install(TARGETS libusbmuxd | 12 | install(TARGETS libusbmuxd |
| 11 | ARCHIVE DESTINATION lib | 13 | ARCHIVE DESTINATION lib |
