diff options
| author | Christian Beier <dontmind@freeshell.org> | 2015-01-27 11:00:41 +0100 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2015-01-27 11:00:41 +0100 |
| commit | cf03f71780ace5db61f194bbe6c832f32fbc10f8 (patch) | |
| tree | 094de1459c55f607ca735cb39a3c0bcef0aff2f4 | |
| parent | 7450e093c5971d8f6c1c6c091fe1962749eb4221 (diff) | |
| parent | 2daa082773c4a4f0481879204b3e3b0361624330 (diff) | |
| download | libtdevnc-cf03f71780ace5db61f194bbe6c832f32fbc10f8.tar.gz libtdevnc-cf03f71780ace5db61f194bbe6c832f32fbc10f8.zip | |
Merge pull request #60 from cinemast/master
fixing SOVERSION and .so VERSION
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 269805f..9486f65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 2.6) +cmake_policy(SET CMP0037 NEW) project(LibVNCServer) include(CheckFunctionExists) @@ -11,10 +12,11 @@ include(CheckCSourceRuns) set(PACKAGE_NAME "LibVNCServer") set(FULL_PACKAGE_NAME "LibVNCServer") -set(PACKAGE_VERSION "0.9.10") set(VERSION_MAJOR "0") set(VERSION_MINOR "9") set(VERSION_PATCHLEVEL "10") +set(VERSION_SO "0") +set(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCHLEVEL}") set(PROJECT_BUGREPORT_PATH "http://sourceforge.net/projects/libvncserver") set(CMAKE_C_FLAGS "-O2 -W -Wall -g") set(LIBVNCSERVER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libvncserver) @@ -291,7 +293,7 @@ target_link_libraries(vncserver ) SET_TARGET_PROPERTIES(vncclient vncserver - PROPERTIES SOVERSION "0.0.0" + PROPERTIES SOVERSION "${VERSION_SO}" VERSION "${PACKAGE_VERSION}" ) # tests @@ -356,14 +358,14 @@ endif(HAVE_FFMPEG) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/examples) foreach(test ${LIBVNCSERVER_TESTS}) - add_executable(examples/${test} ${LIBVNCSRVTEST_DIR}/${test}.c) - target_link_libraries(examples/${test} vncserver ${CMAKE_THREAD_LIBS_INIT}) + add_executable(examples_${test} ${LIBVNCSRVTEST_DIR}/${test}.c) + target_link_libraries(examples_${test} vncserver ${CMAKE_THREAD_LIBS_INIT}) endforeach(test ${LIBVNCSERVER_TESTS}) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/client_examples) foreach(test ${LIBVNCCLIENT_TESTS}) - add_executable(client_examples/${test} ${LIBVNCCLITEST_DIR}/${test}.c ${LIBVNCCLITEST_DIR}/${${test}_EXTRA_SOURCES} ) - target_link_libraries(client_examples/${test} vncclient ${CMAKE_THREAD_LIBS_INIT} ${X11_LIBRARIES} ${SDL_LIBRARY} ${FFMPEG_LIBRARIES}) + add_executable(client_examples_${test} ${LIBVNCCLITEST_DIR}/${test}.c ${LIBVNCCLITEST_DIR}/${${test}_EXTRA_SOURCES} ) + target_link_libraries(client_examples_${test} vncclient ${CMAKE_THREAD_LIBS_INIT} ${X11_LIBRARIES} ${SDL_LIBRARY} ${FFMPEG_LIBRARIES}) endforeach(test ${LIBVNCCLIENT_TESTS}) install_targets(/lib vncserver) |