RPM packaging
[platform/upstream/libphonenumber.git] / cpp / CMakeLists.txt
index 0b782ed..c705f79 100644 (file)
 cmake_minimum_required (VERSION 2.8)
 
 project (libphonenumber)
-set (libphonenumber_VERSION_MAJOR 5)
-set (libphonenumber_VERSION_MINOR 2)
+set (libphonenumber_VERSION_MAJOR 7)
+set (libphonenumber_VERSION_MINOR 0)
+set (libphonenumber_VERSION_PATCH 2)
+
+if (32BIT)
+  set_property (GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+  set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
+  set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
+endif ()
 
 # Helper functions dealing with finding libraries and programs this library
 # depends on.
@@ -69,20 +78,31 @@ function (find_required_program NAME FILENAME DESCRIPTION)
 endfunction (find_required_program)
 
 # Options that can be passed to CMake using 'cmake -DKEY=VALUE'.
+option ("BUILD_GEOCODER" "Build the offline phone number geocoder" "ON")
+option ("USE_ALTERNATE_FORMATS" "Use alternate formats" "ON")
+option ("USE_BOOST" "Use Boost" "ON")
 option ("USE_ICU_REGEXP" "Use ICU regexp engine" "ON")
 option ("USE_LITE_METADATA" "Use lite metadata" "OFF")
 option ("USE_RE2" "Use RE2" "OFF")
 option ("USE_STD_MAP" "Force the use of std::map" "OFF")
+option ("BUILD_STATIC_LIB" "Build static libraries" "ON")
 
-# Find all the required libraries and programs.
-if (WIN32)
-  set (Boost_USE_STATIC_LIBS ON)
+if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
+  add_definitions ("-DI18N_PHONENUMBERS_USE_ALTERNATE_FORMATS")
 endif ()
-find_package (Boost 1.40.0 COMPONENTS date_time thread)
-if (NOT Boost_FOUND)
-  print_error ("Boost Datetime/Thread" "Boost")
+
+# Find all the required libraries and programs.
+if (${USE_BOOST} STREQUAL "ON")
+  add_definitions ("-DI18N_PHONENUMBERS_USE_BOOST")
+  if (WIN32)
+    set (Boost_USE_STATIC_LIBS ON)
+  endif ()
+  find_package (Boost 1.40.0 COMPONENTS date_time system thread)
+  if (NOT Boost_FOUND)
+    print_error ("Boost Date_Time/System/Thread" "Boost")
+  endif ()
+  include_directories (${Boost_INCLUDE_DIRS})
 endif ()
-include_directories (${Boost_INCLUDE_DIRS})
 
 find_or_build_gtest ()
 
@@ -99,8 +119,8 @@ check_library_version (PC_ICU_UC icu-uc>=4.4)
 
 set (ICU_INCLUDE_DIR ${ICU_UC_INCLUDE_DIR})
 set (ICU_LIB ${ICU_UC_LIB})
-# If ICU regexp engine is used, use icui18n as well.
-if (${USE_ICU_REGEXP} STREQUAL "ON")
+# If ICU regexp engine is used or if the geocoder is built, use icui18n as well.
+if (${USE_ICU_REGEXP} STREQUAL "ON" OR ${BUILD_GEOCODER} STREQUAL "ON")
   find_required_library (ICU_I18N unicode/regex.h icui18n "ICU")
   check_library_version (PC_ICU_I18N icu-i18n>=4.4)
   list (APPEND ICU_INCLUDE_DIR ${ICU_I18N_INCLUDE_DIR})
@@ -122,7 +142,7 @@ if (${USE_STD_MAP} STREQUAL "OFF")
   INCLUDE (CheckIncludeFileCXX)
   CHECK_INCLUDE_FILE_CXX ("tr1/unordered_map" HAVE_CXX_TR1_UNORDERED_MAP)
   if (HAVE_CXX_TR1_UNORDERED_MAP)
-    add_definitions ("-DUSE_TR1_UNORDERED_MAP")
+    add_definitions ("-DI18N_PHONENUMBERS_USE_TR1_UNORDERED_MAP")
   endif ()
 endif ()
 
@@ -149,50 +169,42 @@ add_custom_command (
   DEPENDS ${PROTOBUF_SOURCES}
 )
 
-add_custom_target (
-  generate-sources
-
-  DEPENDS ${PROTOBUF_OUTPUT}
-  COMMENT "Generating Protocol Buffers code"
-)
-
-# Geocoding data cpp file generation
-set (TOOLS_DIR "${CMAKE_CURRENT_BINARY_DIR}/tools")
-add_subdirectory("${CMAKE_SOURCE_DIR}/../tools/cpp" "${TOOLS_DIR}")
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  # Geocoding data cpp file generation
+  set (TOOLS_DIR "${CMAKE_CURRENT_BINARY_DIR}/tools")
+  add_subdirectory("${CMAKE_SOURCE_DIR}/../tools/cpp" "${TOOLS_DIR}")
 
-set (GEOCODING_DIR "${RESOURCES_DIR}/geocoding")
-file (GLOB_RECURSE GEOCODING_SOURCES "${GEOCODING_DIR}/*.txt")
+  set (GEOCODING_DIR "${RESOURCES_DIR}/geocoding")
+  file (GLOB_RECURSE GEOCODING_SOURCES "${GEOCODING_DIR}/*.txt")
 
-set (GEOCODING_DATA_OUTPUT
-  "${CMAKE_SOURCE_DIR}/src/phonenumbers/geocoding/geocoding_data.cc"
-)
+  set (GEOCODING_DATA_OUTPUT
+    "${CMAKE_SOURCE_DIR}/src/phonenumbers/geocoding/geocoding_data.cc"
+  )
 
-add_custom_command (
-  COMMAND generate_geocoding_data "${GEOCODING_DIR}" "${GEOCODING_DATA_OUTPUT}"
+  add_custom_command (
+    COMMAND generate_geocoding_data "${GEOCODING_DIR}"
+      "${GEOCODING_DATA_OUTPUT}"
 
-  OUTPUT ${GEOCODING_DATA_OUTPUT}
-  DEPENDS ${GEOCODING_SOURCES}
-          generate_geocoding_data
-  COMMENT "Generating geocoding data code"
-)
+    OUTPUT ${GEOCODING_DATA_OUTPUT}
+    DEPENDS ${GEOCODING_SOURCES}
+            generate_geocoding_data
+    COMMENT "Generating geocoding data code"
+  )
+endif ()
 
 set (
   SOURCES
-  "src/base/string_piece.cc"
   "src/phonenumbers/asyoutypeformatter.cc"
+  "src/phonenumbers/base/strings/string_piece.cc"
   "src/phonenumbers/default_logger.cc"
-  "src/phonenumbers/geocoding/area_code_map.cc"
-  "src/phonenumbers/geocoding/default_map_storage.cc"
-  "src/phonenumbers/geocoding/geocoding_data.cc"
-  "src/phonenumbers/geocoding/mapping_file_provider.cc"
-  "src/phonenumbers/geocoding/phonenumber_offline_geocoder.cc"
   "src/phonenumbers/logger.cc"
   "src/phonenumbers/phonemetadata.pb.cc" # Generated by Protocol Buffers.
   "src/phonenumbers/phonenumber.cc"
   "src/phonenumbers/phonenumber.pb.cc"   # Generated by Protocol Buffers.
   "src/phonenumbers/phonenumberutil.cc"
+  "src/phonenumbers/regex_based_matcher.cc"
   "src/phonenumbers/regexp_cache.cc"
-  "src/phonenumbers/shortnumberutil.cc"
+  "src/phonenumbers/shortnumberinfo.cc"
   "src/phonenumbers/string_byte_sink.cc"
   "src/phonenumbers/stringutil.cc"
   "src/phonenumbers/unicodestring.cc"
@@ -201,28 +213,46 @@ set (
   "src/phonenumbers/utf/unilib.cc"
 )
 
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  set (
+    GEOCODING_SOURCES
+    "src/phonenumbers/geocoding/area_code_map.cc"
+    "src/phonenumbers/geocoding/default_map_storage.cc"
+    "src/phonenumbers/geocoding/geocoding_data.cc"
+    "src/phonenumbers/geocoding/mapping_file_provider.cc"
+    "src/phonenumbers/geocoding/phonenumber_offline_geocoder.cc"
+    "src/phonenumbers/phonenumber.pb.h"  # Forces proto buffer generation.
+  )
+endif ()
+
 # Add regexp engine-dependent sources. ICU is used by default.
 if (${USE_RE2} STREQUAL "ON")
   # Add a flag to select the right regexp factory implementation used by
   # regexp_factory.h and regexp_adapter_test.cc.
   # When both ICU regexp and RE2 are defined, the regexp engine adapter defaults
   # to RE2 unless the ICU implementation is instantiated explictly obviously.
-  add_definitions (-DUSE_RE2)
+  add_definitions ("-DI18N_PHONENUMBERS_USE_RE2")
   list (APPEND SOURCES "src/phonenumbers/regexp_adapter_re2.cc")
 endif ()
 
 if (${USE_ICU_REGEXP} STREQUAL "ON")
-  add_definitions (-DUSE_ICU_REGEXP)
+  add_definitions ("-DI18N_PHONENUMBERS_USE_ICU_REGEXP")
   list (APPEND SOURCES "src/phonenumbers/regexp_adapter_icu.cc")
   # The phone number matcher needs ICU.
-  list (APPEND SOURCES "src/phonenumbers/alternate_format.cc")
   list (APPEND SOURCES "src/phonenumbers/phonenumbermatch.cc")
   list (APPEND SOURCES "src/phonenumbers/phonenumbermatcher.cc")
+  if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
+    list (APPEND SOURCES "src/phonenumbers/alternate_format.cc")
+  endif ()
 endif ()
 
 # Library sources excluding the metadata files, since special metadata is used
-# for unit-testing.
+# for unit-testing. Note that a single testing library is built for both
+# libphonenumber and geocoding.
 set (TESTING_LIBRARY_SOURCES ${SOURCES})
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  list (APPEND TESTING_LIBRARY_SOURCES ${GEOCODING_SOURCES})
+endif ()
 
 # Add metadata code generation targets.
 
@@ -258,7 +288,7 @@ if (${USE_LITE_METADATA} STREQUAL "ON")
   set (METADATA_TARGET "generate-lite-metadata")
   add_metadata_gen_target (
     ${METADATA_TARGET}
-    "${RESOURCES_DIR}/PhoneNumberMetaData.xml"
+    "${RESOURCES_DIR}/PhoneNumberMetadata.xml"
     "lite_metadata"
     "metadata"
   )
@@ -268,7 +298,7 @@ else ()
   set (METADATA_TARGET "generate-metadata")
   add_metadata_gen_target (
     ${METADATA_TARGET}
-    "${RESOURCES_DIR}/PhoneNumberMetaData.xml"
+    "${RESOURCES_DIR}/PhoneNumberMetadata.xml"
     "metadata"
     "metadata"
   )
@@ -279,21 +309,35 @@ endif ()
 set (TEST_METADATA_TARGET "generate-test-metadata")
 add_metadata_gen_target (
   ${TEST_METADATA_TARGET}
-  "${RESOURCES_DIR}/PhoneNumberMetaDataForTesting.xml"
+  "${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml"
   "test_metadata"
   "metadata"
 )
 list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_metadata.cc")
 
+# Add the short metadata generation target.
+set (SHORT_METADATA_TARGET "generate-short-number-metadata")
+add_metadata_gen_target (
+  ${SHORT_METADATA_TARGET}
+  "${RESOURCES_DIR}/ShortNumberMetadata.xml"
+  "short_metadata"
+  "short_metadata"
+)
+# This is used both for the real library and for testing.
+list (APPEND SOURCES "src/phonenumbers/short_metadata.cc")
+list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/short_metadata.cc")
+
 if (${USE_ICU_REGEXP} STREQUAL "ON")
-  # Add alternate format metadata generation for the phone number matcher
-  set (ALT_FORMAT_METADATA_TARGET "generate-alt-format-metadata")
-  add_metadata_gen_target (
-    ${ALT_FORMAT_METADATA_TARGET}
-    "${RESOURCES_DIR}/PhoneNumberAlternateFormats.xml"
-    "alternate_format"
-    "alternate_format"
-  )
+  if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
+    # Add alternate format metadata generation for the phone number matcher.
+    set (ALT_FORMAT_METADATA_TARGET "generate-alt-format-metadata")
+    add_metadata_gen_target (
+      ${ALT_FORMAT_METADATA_TARGET}
+      "${RESOURCES_DIR}/PhoneNumberAlternateFormats.xml"
+      "alternate_format"
+      "alternate_format"
+    )
+  endif ()
 endif ()
 
 if (NOT WIN32)
@@ -302,11 +346,29 @@ endif ()
 
 include_directories ("src")
 
-# Build a static library (without -fPIC).
-add_library (phonenumber STATIC ${SOURCES})
-add_dependencies (phonenumber generate-sources ${METADATA_TARGET})
-if (${USE_ICU_REGEXP} STREQUAL "ON")
-  add_dependencies (phonenumber ${ALT_FORMAT_METADATA_TARGET})
+if ($BUILD_STATIC_LIB STREQUAL "ON")
+  # Build a static library (without -fPIC).
+  add_library (phonenumber STATIC ${SOURCES})
+  if (${USE_ICU_REGEXP} STREQUAL "ON")
+    if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
+      add_dependencies (phonenumber ${ALT_FORMAT_METADATA_TARGET})
+    endif ()
+  endif ()
+endif ()
+
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  if ($BUILD_STATIC_LIB STREQUAL "ON")
+    add_library (geocoding STATIC ${GEOCODING_SOURCES})
+  endif ()
+  # The geocoder doesn't use RE2 so there is no reason not to build a shared
+  # library for it.
+  add_library (geocoding-shared SHARED ${GEOCODING_SOURCES})
+  set_target_properties (geocoding-shared
+    PROPERTIES
+      OUTPUT_NAME "geocoding"
+      PREFIX "lib"
+      SOVERSION ${libphonenumber_VERSION_MAJOR}
+      VERSION ${libphonenumber_VERSION_MAJOR}.${libphonenumber_VERSION_MINOR})
 endif ()
 
 # Build a shared library (with -fPIC).
@@ -324,9 +386,10 @@ endif ()
 
 if (BUILD_SHARED_LIB)
   add_library (phonenumber-shared SHARED ${SOURCES})
-  add_dependencies (phonenumber-shared generate-sources ${METADATA_TARGET})
   if (${USE_ICU_REGEXP} STREQUAL "ON")
-    add_dependencies (phonenumber ${ALT_FORMAT_METADATA_TARGET})
+    if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
+      add_dependencies (phonenumber-shared ${ALT_FORMAT_METADATA_TARGET})
+    endif ()
   endif ()
   set_target_properties (phonenumber-shared
     PROPERTIES
@@ -336,62 +399,90 @@ if (BUILD_SHARED_LIB)
       VERSION ${libphonenumber_VERSION_MAJOR}.${libphonenumber_VERSION_MINOR})
 endif ()
 
-set (LIBRARY_DEPS ${PROTOBUF_LIB} ${ICU_LIB} ${Boost_LIBRARIES})
+# Libraries used by both libphonenumber and libgeocoding.
+set (COMMON_DEPS ${ICU_LIB})
+
+set (LIBRARY_DEPS ${PROTOBUF_LIB})
+
+if (${USE_BOOST} STREQUAL "ON")
+  list (APPEND LIBRARY_DEPS ${Boost_LIBRARIES})
+endif ()
 
 if (${USE_RE2} STREQUAL "ON")
   list (APPEND LIBRARY_DEPS ${RE2_LIB})
 endif ()
 
 if (APPLE)
-  list (APPEND LIBRARY_DEPS ${COREFOUNDATION_LIB} ${FOUNDATION_LIB})
+  list (APPEND COMMON_DEPS ${COREFOUNDATION_LIB} ${FOUNDATION_LIB})
 endif ()
 
-target_link_libraries (phonenumber ${LIBRARY_DEPS})
+list (APPEND LIBRARY_DEPS ${COMMON_DEPS})
+
+if (${BUILD_STATIC_LIB} STREQUAL "ON")
+  target_link_libraries (phonenumber ${LIBRARY_DEPS})
+endif ()
 
 if (BUILD_SHARED_LIB)
   target_link_libraries (phonenumber-shared ${LIBRARY_DEPS})
 endif ()
 
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  list (APPEND GEOCODER_DEPS ${COMMON_DEPS})
+  # Note that the subset of base/ on which the geocoder relies is implemented
+  # on top of Boost header-only libraries (e.g. scoped_ptr.hpp).
+  target_link_libraries (geocoding ${LIBRARY_DEPS})
+  target_link_libraries (geocoding-shared ${LIBRARY_DEPS})
+endif ()
+
 # Build a specific library for testing purposes.
 add_library (phonenumber_testing STATIC ${TESTING_LIBRARY_SOURCES})
 target_link_libraries (phonenumber_testing ${LIBRARY_DEPS})
-add_dependencies (phonenumber_testing generate-sources ${TEST_METADATA_TARGET})
 
-# Test geocoding data cpp files generation
-set (GEOCODING_TEST_DIR "${RESOURCES_DIR}/test/geocoding")
-file (GLOB_RECURSE GEOCODING_TEST_SOURCES "${GEOCODING_TEST_DIR}/*.txt")
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  # Test geocoding data cpp files generation.
+  set (GEOCODING_TEST_DIR "${RESOURCES_DIR}/test/geocoding")
+  file (GLOB_RECURSE GEOCODING_TEST_SOURCES "${GEOCODING_TEST_DIR}/*.txt")
 
-set (GEOCODING_TEST_DATA_OUTPUT
-  "${CMAKE_SOURCE_DIR}/test/phonenumbers/geocoding/geocoding_test_data.cc"
-)
+  set (GEOCODING_TEST_DATA_OUTPUT
+    "${CMAKE_SOURCE_DIR}/test/phonenumbers/geocoding/geocoding_test_data.cc"
+  )
 
-add_custom_command (
-  COMMAND generate_geocoding_data "${GEOCODING_TEST_DIR}"
-    "${GEOCODING_TEST_DATA_OUTPUT}" "_test"
+  add_custom_command (
+    COMMAND generate_geocoding_data "${GEOCODING_TEST_DIR}"
+      "${GEOCODING_TEST_DATA_OUTPUT}" "_test"
+
+    OUTPUT ${GEOCODING_TEST_DATA_OUTPUT}
+    DEPENDS ${GEOCODING_TEST_SOURCES} generate_geocoding_data
+    COMMENT "Generating geocoding test data code"
+  )
+endif ()
 
-  OUTPUT ${GEOCODING_TEST_DATA_OUTPUT}
-  DEPENDS ${GEOCODING_TEST_SOURCES} generate_geocoding_data
-  COMMENT "Generating geocoding test data code"
-)
 
 set (TEST_SOURCES
   "test/phonenumbers/asyoutypeformatter_test.cc"
-  "test/phonenumbers/geocoding/area_code_map_test.cc"
-  "test/phonenumbers/geocoding/geocoding_data_test.cc"
-  "test/phonenumbers/geocoding/geocoding_test_data.cc"
-  "test/phonenumbers/geocoding/mapping_file_provider_test.cc"
-  "test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc"
   "test/phonenumbers/logger_test.cc"
   "test/phonenumbers/phonenumberutil_test.cc"
   "test/phonenumbers/regexp_adapter_test.cc"
   "test/phonenumbers/regexp_cache_test.cc"
   "test/phonenumbers/run_tests.cc"
-  "test/phonenumbers/shortnumberutil_test.cc"
+  "test/phonenumbers/shortnumberinfo_test.cc"
   "test/phonenumbers/stringutil_test.cc"
   "test/phonenumbers/test_util.cc"
   "test/phonenumbers/unicodestring_test.cc"
   "test/phonenumbers/utf/unicodetext_test.cc"
 )
+
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  set (GEOCODING_TEST_SOURCES
+    "test/phonenumbers/geocoding/area_code_map_test.cc"
+    "test/phonenumbers/geocoding/geocoding_data_test.cc"
+    "test/phonenumbers/geocoding/geocoding_test_data.cc"
+    "test/phonenumbers/geocoding/mapping_file_provider_test.cc"
+    "test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc"
+  )
+  list (APPEND TEST_SOURCES ${GEOCODING_TEST_SOURCES})
+endif ()
+
 if (${USE_ICU_REGEXP} STREQUAL "ON")
   # Add the phone number matcher tests.
   list (APPEND TEST_SOURCES "test/phonenumbers/phonenumbermatch_test.cc")
@@ -408,24 +499,34 @@ if (NOT WIN32)
 endif ()
 
 target_link_libraries (libphonenumber_test ${TEST_LIBS})
-add_custom_target (test
-  COMMAND generate_geocoding_data_test
-  COMMAND libphonenumber_test
 
-  DEPENDS generate_geocoding_data_test libphonenumber_test
-)
+# Unfortunately add_custom_target() can't accept a single command provided as a
+# list of commands.
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  add_custom_target (test
+    COMMAND generate_geocoding_data_test
+    COMMAND libphonenumber_test
+    DEPENDS generate_geocoding_data_test libphonenumber_test
+  )
+else ()
+  add_custom_target (test
+    COMMAND libphonenumber_test
+    DEPENDS libphonenumber_test
+  )
+endif ()
 
 # Install rules.
 install (FILES
   "src/phonenumbers/asyoutypeformatter.h"
   "src/phonenumbers/callback.h"
   "src/phonenumbers/logger.h"
+  "src/phonenumbers/matcher_api.h"
   "src/phonenumbers/phonenumber.pb.h"
   "src/phonenumbers/phonemetadata.pb.h"
   "src/phonenumbers/phonenumberutil.h"
   "src/phonenumbers/regexp_adapter.h"
   "src/phonenumbers/regexp_cache.h"
-  "src/phonenumbers/shortnumberutil.h"
+  "src/phonenumbers/shortnumberinfo.h"
   "src/phonenumbers/unicodestring.h"
   DESTINATION include/phonenumbers/
 )
@@ -443,20 +544,75 @@ if (${USE_ICU_REGEXP} STREQUAL "ON")
   )
 endif ()
 
-install (FILES "src/base/basictypes.h" DESTINATION include/base/)
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  install (FILES
+    "src/phonenumbers/geocoding/phonenumber_offline_geocoder.h"
+    DESTINATION include/phonenumbers/geocoding
+  )
+endif ()
+
+install (
+  FILES
+  "src/phonenumbers/base/basictypes.h"
+  "src/phonenumbers/base/template_util.h"
+  "src/phonenumbers/base/logging.h"
+  "src/phonenumbers/base/thread_checker.h"
+  DESTINATION include/phonenumbers/base/
+)
 
 install (FILES
-  "src/base/memory/scoped_ptr.h"
-  "src/base/memory/singleton.h"
-  DESTINATION include/base/memory/
+  "src/phonenumbers/base/memory/scoped_ptr.h"
+  "src/phonenumbers/base/memory/singleton.h"
+  "src/phonenumbers/base/memory/singleton_posix.h"
+  DESTINATION include/phonenumbers/base/memory/
 )
 
-install (FILES "src/base/synchronization/lock.h"
-         DESTINATION include/base/synchronization/)
+install (FILES "src/phonenumbers/base/synchronization/lock.h"
+         DESTINATION include/phonenumbers/base/synchronization/)
+
+get_property (LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+
+if ("${LIB64}" STREQUAL "TRUE")
+    set (LIBDIR lib64)
+else ()
+    set (LIBDIR lib)
+endif ()
 
-install (TARGETS phonenumber LIBRARY DESTINATION lib/ ARCHIVE DESTINATION lib/)
+if (${BUILD_STATIC_LIB} STREQUAL "ON")
+  install (TARGETS phonenumber LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
+endif ()
 
 if (BUILD_SHARED_LIB)
-  install (TARGETS phonenumber-shared LIBRARY DESTINATION lib/ ARCHIVE
-           DESTINATION lib/)
+  install (TARGETS phonenumber-shared LIBRARY DESTINATION ${LIBDIR} ARCHIVE
+           DESTINATION ${LIBDIR})
+endif ()
+
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  install (TARGETS geocoding LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
+  install (TARGETS geocoding-shared LIBRARY DESTINATION ${LIBDIR} ARCHIVE
+           DESTINATION ${LIBDIR})
+endif ()
+
+# Build an example program using geocoding, mainly to make sure that both
+# libraries are built properly.
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  add_executable (
+    geocoding_test_program
+    "test/phonenumbers/geocoding/geocoding_test_program.cc"
+  )
+  target_link_libraries (geocoding_test_program geocoding phonenumber)
+endif ()
+
+# Build an RPM
+set (CPACK_PACKAGE_VERSION ${libphonenumber_VERSION_MAJOR}.${libphonenumber_VERSION_MINOR}.${libphonenumber_VERSION_PATCH})
+set (CPACK_GENERATOR "RPM")
+set (CPACK_PACKAGE_NAME "libphonenumber")
+set (CPACK_RPM_PACKAGE_RELEASE 1)
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Google's phone number handling library")
+if (32BIT)
+  set (CPACK_RPM_PACKAGE_ARCHITECTURE i686)
+else ()
+  set (CPACK_RPM_PACKAGE_ARCHITECTURE x86_64)
 endif ()
+set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
+include (CPack)