From 72a8d046e16268669e18940c3ebf22ecae6ef581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gon=C3=A7alves?= <mail@cgoncalves.info>
Date: Fri, 21 Aug 2009 18:53:00 +0100
Subject: Allow defining the 'lib' dir (eg. 'lib64').

This is required by some distributions such as openSUSE, where 64-bit
libraries are installed in lib64 directories and 32-bit libraries in the lib
directories.
---
 CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8de46e16e..e453cfe38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,9 @@ parser/rpp/pp-main.cpp
 parser/rpp/preprocessor.cpp
 )
 
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
+
 qt4_add_resources(apiextractor_RCCS_SRC generator.qrc)
 
 set(apiextractor_MOC_HEADERS
@@ -121,8 +124,8 @@ install(FILES ${root_HEADERS} DESTINATION include/apiextractor)
 #         FILES_MATCHING PATTERN "*.h"
 #         PATTERN ".svn" EXCLUDE
 #         )
-install(TARGETS apiextractor LIBRARY DESTINATION lib)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apiextractor.pc DESTINATION lib/pkgconfig)
+install(TARGETS apiextractor LIBRARY DESTINATION ${LIB_INSTALL_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apiextractor.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindApiExtractor.cmake
         DESTINATION share/cmake-2.6/Modules)
 
-- 
cgit v1.2.3


From f6eb7272e613b2878f7abee6280f3d375e9379c0 Mon Sep 17 00:00:00 2001
From: Hugo Lima <hugo.lima@openbossa.org>
Date: Mon, 24 Aug 2009 13:52:33 -0300
Subject: Fixed apiextractor version, so it now creates the symlinks for
 libapiextractor.so.0 and libapiextractor.so.0.x

Reviewed by Lauro Moura
---
 CMakeLists.txt | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e453cfe38..b9ab92acc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,9 @@ pkg_check_modules(LIBXSLT REQUIRED libxslt>=1.1.19)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -DAPIEXTRACTOR_ENABLE_DUPLICATE_ENUM_VALUES")
 
-set(apiextractor_VERSION 0.2)
+set(apiextractor_MAJOR_VERSION 0)
+set(apiextractor_MINOR_VERSION 2)
+set(apiextractor_VERSION "${apiextractor_MAJOR_VERSION}.${apiextractor_MINOR_VERSION}")
 configure_file(apiextractorversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/apiextractorversion.h @ONLY)
 set(QT_USE_QTCORE 1)
 set(QT_USE_QTXML 1)
@@ -81,7 +83,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 
 add_library(apiextractor SHARED ${apiextractor_SRC} ${apiextractor_MOC_SRC} ${apiextractor_RCCS_SRC})
 target_link_libraries(apiextractor ${Boost_GRAPH_LIBRARY} ${LIBXSLT_LIBRARIES} ${LIBXML2_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTXMLPATTERNS_LIBRARY} ${QT_QTXML_LIBRARY})
-set_target_properties(apiextractor PROPERTIES SOVERSION ${apiextractor_VERSION})
+set_target_properties(apiextractor PROPERTIES VERSION ${apiextractor_VERSION} SOVERSION ${apiextractor_MAJOR_VERSION})
 
 # create pkg-config file
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/apiextractor.pc.in
@@ -92,12 +94,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FindApiExtractor.cmake.in ${CMAKE_CUR
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
-# "make dist", in fact "make package_source"
-#set(CPACK_SOURCE_PACKAGE_FILE_NAME "libapiextractor-${apiextractor_VERSION}")
-#set(CPACK_SOURCE_GENERATOR TGZ)
-#set(CPACK_SOURCE_IGNORE_FILES "~$" ".svn" "debian/" "build/" ".swp$" "*.kdev4")
-#include(CPack)
-
 set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${apiextractor_VERSION})
 add_custom_target(dist
     COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
@@ -119,11 +115,6 @@ enable_testing()
 add_subdirectory(tests)
 
 install(FILES ${root_HEADERS} DESTINATION include/apiextractor)
-# TODO We do not need to expose these internal headers!
-# install(DIRECTORY parser DESTINATION include/apiextractor
-#         FILES_MATCHING PATTERN "*.h"
-#         PATTERN ".svn" EXCLUDE
-#         )
 install(TARGETS apiextractor LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apiextractor.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindApiExtractor.cmake
-- 
cgit v1.2.3