cmake: Set correct versions for libraries

Signed-off-by: Andreas Schneider <asn@samba.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de9234866c796d3d395564831430e037ce0f29e0..95aaedc02eae5802efea5b1bf35a40682a630696 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
 
 set(APPLICATION_VERSION_MAJOR "1")
 set(APPLICATION_VERSION_MINOR "0")
-set(APPLICATION_VERSION_PATCH "2")
+set(APPLICATION_VERSION_PATCH "0")
 
 set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
 
@@ -19,9 +19,12 @@ set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINO
 #     Increment AGE. Set REVISION to 0
 #   If the source code was changed, but there were no interface changes:
 #     Increment REVISION.
-set(LIBRARY_VERSION "0.0.2")
+set(LIBRARY_VERSION "0.0.1")
 set(LIBRARY_SOVERSION "0")
 
+set(PAMTEST_LIBRARY_VERSION "0.0.1")
+set(PAMTEST_LIBRARY_SOVERSION "0")
+
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH
   ${CMAKE_SOURCE_DIR}/cmake/Modules
@@ -42,7 +45,7 @@ macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source buil
 # Find out if we have threading available
 set(CMAKE_THREAD_PREFER_PTHREADS ON)
 find_package(Threads)
-set(Python_ADDITIONAL_VERSIONS 2.7 3.4)
+set(Python_ADDITIONAL_VERSIONS 2.6 2.7 3.3 3.4)
 find_package(PythonLibs)
 
 # config.h checks

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fae6dfaf5a76a73e259aeac1b82a42956a3c9331..6e37c32d16806323d98f807d8e68ca39250dabaa 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,16 @@
 project(libpam_wrapper C)
 
 include_directories(${CMAKE_BINARY_DIR})
+
+###########################################################
+### pam_wrapper
+###########################################################
+
 add_library(pam_wrapper SHARED pam_wrapper.c)
-target_link_libraries(pam_wrapper ${PAMWRAP_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+
+target_link_libraries(pam_wrapper
+                      ${PAMWRAP_REQUIRED_LIBRARIES}
+                      ${CMAKE_THREAD_LIBS_INIT})
 
 set_target_properties(
   pam_wrapper
@@ -21,29 +29,34 @@ install(
   ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
 )
 
+###########################################################
+### libpamtest
+###########################################################
+
 set(pamtest_SOURCES
-       libpamtest.c
+    libpamtest.c
 )
 
 set(pamtest_HEADERS
-       ${CMAKE_SOURCE_DIR}/include/libpamtest.h
+    ${CMAKE_SOURCE_DIR}/include/libpamtest.h
 )
 include_directories(${CMAKE_SOURCE_DIR}/include)
 
 add_library(pamtest SHARED
-           ${pamtest_SOURCES}
-           ${pamtest_HEADERS}
+            ${pamtest_SOURCES}
+            ${pamtest_HEADERS}
 )
-target_link_libraries(pamtest
-                       ${PAM_LIBRARIES})
+target_link_libraries(pamtest ${PAM_LIBRARIES})
 
-install(
-  TARGETS
-    pamtest
-  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+set_target_properties(pamtest
+    PROPERTIES
+        VERSION ${LIBRARY_VERSION}
+        SOVERSION ${LIBRARY_SOVERSION})
+
+install(TARGETS pamtest
+    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
 
 add_subdirectory(modules)
 if (PYTHONLIBS_FOUND)