avoid hard-coding lib path
[platform/upstream/libphonenumber.git] / cpp / CMakeLists.txt
index d79af6b..1eeaa2f 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Google Inc.
+# Copyright (C) 2011 The Libphonenumber Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Author: Philippe Liard
+
 cmake_minimum_required (VERSION 2.8)
 
 project (libphonenumber)
+set (libphonenumber_VERSION_MAJOR 7)
+set (libphonenumber_VERSION_MINOR 0)
 
-# Find Google Test library
-find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
-
-if (GTEST_INCLUDE_DIR STREQUAL "GTEST_INCLUDE_DIR-NOTFOUND")
-  message (FATAL_ERROR
-    "Can't find Google Test framework headers. Please read README.")
-endif ()
+include ( GNUInstallDirs )
 
-include_directories (${GTEST_INCLUDE_DIR})
+# Helper functions dealing with finding libraries and programs this library
+# depends on.
 
-find_library (GTEST_LIB gtest)
+include (../tools/cpp/gtest.cmake)
 
-if (GTEST_LIB STREQUAL "GTEST_LIB-NOTFOUND")
+function (print_error DESCRIPTION FILE)
   message (FATAL_ERROR
-    "Can't find Google Test framework library. Please read README.")
-endif ()
+    "Can't find ${DESCRIPTION}: can't locate ${FILE}. Please read the README.")
+endfunction ()
+
+# Find a library. If it has not been found, stop CMake with a fatal error
+# message.
+function (find_required_library NAME HEADER LIBRARY DESCRIPTION)
+  # Check the header.
+  find_path (${NAME}_INCLUDE_DIR ${HEADER})
+  set (INCLUDE_DIR ${${NAME}_INCLUDE_DIR})
+
+  if (${INCLUDE_DIR} STREQUAL "${INCLUDE_DIR}-NOTFOUND")
+    print_error (${DESCRIPTION} ${HEADER})
+  endif ()
+  include_directories (${INCLUDE_DIR})
+  # Check the binary.
+  find_library (${NAME}_LIB ${LIBRARY})
+  set (LIB ${NAME}_LIB)
 
+  if (${LIB} STREQUAL "${LIB}-NOTFOUND")
+    print_error (${DESCRIPTION} ${LIBRARY})
+  endif ()
+endfunction (find_required_library)
 
-# Find Google RE2 library
-find_path (RE2_INCLUDE_DIR re2/re2.h)
+# Check the library version (if pkg-config available).
+find_package (PkgConfig)
+function (check_library_version VARNAME LIBRARY_WITH_VERSION)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules (${VARNAME} ${LIBRARY_WITH_VERSION})
+  endif ()
+endfunction ()
 
-if (RE2_INCLUDE_DIR STREQUAL "RE2_INCLUDE_DIR-NOTFOUND")
-  message (FATAL_ERROR
-    "Can't find Google RE2 headers. Please read README.")
+# Find a program. If it has not been found, stop CMake with a fatal error
+# message.
+function (find_required_program NAME FILENAME DESCRIPTION)
+  find_program (${NAME}_BIN NAMES ${FILENAME})
+
+  if (${NAME}_BIN STREQUAL "${${NAME}_BIN}-NOTFOUND")
+    print_error (${DESCRIPTION} ${FILENAME})
+  endif ()
+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")
+
+if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
+  add_definitions ("-DI18N_PHONENUMBERS_USE_ALTERNATE_FORMATS")
 endif ()
 
-include_directories (${RE2_INCLUDE_DIR})
+# 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 ()
 
-find_library (RE2_LIB re2)
+find_or_build_gtest ()
 
-if (RE2_LIB STREQUAL "RE2_LIB-NOTFOUND")
-  message (FATAL_ERROR
-    "Can't find Google RE2 library. Please read README.")
+if (${USE_RE2} STREQUAL "ON")
+  find_required_library (RE2 re2/re2.h re2 "Google RE2")
 endif ()
 
+find_required_library (PROTOBUF google/protobuf/message_lite.h protobuf
+                       "Google Protocol Buffers")
+check_library_version (PC_PROTOBUF protobuf>=2.4)
+
+find_required_library (ICU_UC unicode/uchar.h icuuc "ICU")
+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 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})
+  list (APPEND ICU_LIB ${ICU_I18N_LIB})
+endif ()
 
-# Find Protocol Buffers compiler
-find_program (PROTOC NAMES protoc)
+find_required_program (PROTOC protoc
+                       "Google Protocol Buffers compiler (protoc)")
 
-if (PROTOC STREQUAL "PROTOC-NOTFOUND")
-  message (FATAL_ERROR
-      "Can't find Google Protocol Buffers compiler (protoc). "
-      "Please read README.")
+find_required_program (JAVA java
+                       "Java Runtime Environment")
+
+if (APPLE)
+  FIND_LIBRARY (COREFOUNDATION_LIB CoreFoundation)
+  FIND_LIBRARY (FOUNDATION_LIB Foundation)
 endif ()
 
-# Add protoc (Protocol Buffers compiler) target
-set (
-  PROTOBUF_SOURCES "${CMAKE_SOURCE_DIR}/src/phonemetadata.proto"
-                   "${CMAKE_SOURCE_DIR}/src/phonenumber.proto"
+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 ("-DI18N_PHONENUMBERS_USE_TR1_UNORDERED_MAP")
+  endif ()
+endif ()
+
+# Add protoc (Protocol Buffers compiler) target.
+set (RESOURCES_DIR "${CMAKE_SOURCE_DIR}/../resources")
 
+set (
+  PROTOBUF_SOURCES "${RESOURCES_DIR}/phonemetadata.proto"
+                   "${RESOURCES_DIR}/phonenumber.proto"
 )
 
 set (
-  PROTOBUF_OUTPUT "${CMAKE_SOURCE_DIR}/src/phonemetadata.pb.cc"
-                  "${CMAKE_SOURCE_DIR}/src/phonemetadata.pb.h"
-                  "${CMAKE_SOURCE_DIR}/src/phonenumber.pb.cc"
-                  "${CMAKE_SOURCE_DIR}/src/phonenumber.pb.h"
+  PROTOBUF_OUTPUT "${CMAKE_SOURCE_DIR}/src/phonenumbers/phonemetadata.pb.cc"
+                  "${CMAKE_SOURCE_DIR}/src/phonenumbers/phonemetadata.pb.h"
+                  "${CMAKE_SOURCE_DIR}/src/phonenumbers/phonenumber.pb.cc"
+                  "${CMAKE_SOURCE_DIR}/src/phonenumbers/phonenumber.pb.h"
 )
 
 add_custom_command (
-  COMMAND ${PROTOC} --cpp_out=${CMAKE_SOURCE_DIR}
-    --proto_path=${CMAKE_SOURCE_DIR} ${PROTOBUF_SOURCES}
+  COMMAND ${PROTOC_BIN} --cpp_out=${CMAKE_SOURCE_DIR}/src/phonenumbers/
+    --proto_path=${RESOURCES_DIR} ${PROTOBUF_SOURCES}
 
   OUTPUT ${PROTOBUF_OUTPUT}
   DEPENDS ${PROTOBUF_SOURCES}
 )
 
-add_custom_target (
-  generate-sources
+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}")
 
-  DEPENDS ${PROTOBUF_OUTPUT}
-  COMMENT "Generating Protocol Buffers code"
-)
+  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"
+  )
+
+  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"
+  )
+endif ()
 
-# Platform independent sources
 set (
   SOURCES
-  "src/base/at_exit.cc"
-  "src/base/lazy_instance.cc"
-  "src/base/synchronization/lock.cc"
-  "src/base/threading/thread_restrictions.cc"
-  "src/phonenumberutil.cc"
-  "src/re2_cache.cc"
-  "src/stringutil.cc"
-  "src/utf/rune.c"
+  "src/phonenumbers/asyoutypeformatter.cc"
+  "src/phonenumbers/base/strings/string_piece.cc"
+  "src/phonenumbers/default_logger.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/shortnumberinfo.cc"
+  "src/phonenumbers/string_byte_sink.cc"
+  "src/phonenumbers/stringutil.cc"
+  "src/phonenumbers/unicodestring.cc"
+  "src/phonenumbers/utf/rune.c"
+  "src/phonenumbers/utf/unicodetext.cc"
+  "src/phonenumbers/utf/unilib.cc"
 )
 
-if (UNIX)
-  if (CMAKE_COMPILER_IS_GNUCXX)
-    add_definitions ("-Wall -Wextra -Werror")
-
-    # The next flags are needed by base/ source files to compile
-    # low level code needed by Singleton
-    add_definitions ("-DCOMPILER_GCC -DOS_POSIX -DOS_LINUX")
-
-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86.*")
-      add_definitions ("-DARCH_CPU_X86_FAMILY")
+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 GCC specific sources
-      list (APPEND SOURCES "src/base/atomicops_internals_x86_gcc.cc")
-    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 ("-DI18N_PHONENUMBERS_USE_RE2")
+  list (APPEND SOURCES "src/phonenumbers/regexp_adapter_re2.cc")
+endif ()
 
-    # TODO: add support for ARCM arch
+if (${USE_ICU_REGEXP} STREQUAL "ON")
+  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/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. 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 POSIX specific sources
-  list (
-    APPEND SOURCES
-    "src/base/synchronization/lock_impl_posix.cc"
-    "src/base/threading/platform_thread_posix.cc"
-    "src/base/threading/thread_local_posix.cc"
+# Add metadata code generation targets.
+
+# This function is invoked to create metadata, test metadata and lite metadata
+# code generation targets.
+function (add_metadata_gen_target TARGET_NAME
+                                  XML_FILE
+                                  METADATA_TYPE
+                                  METADATA_HEADER)
+  set (METADATA_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/phonenumbers")
+  set (GEN_OUTPUT "${METADATA_SOURCE_DIR}/${METADATA_TYPE}.cc"
+                  "${METADATA_SOURCE_DIR}/${METADATA_HEADER}.h")
+  set (JAR_PATH "${CMAKE_SOURCE_DIR}/../tools/java/cpp-build/target")
+  set (JAR_PATH "${JAR_PATH}/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar")
+
+  add_custom_command (
+    COMMAND ${JAVA_BIN} -jar
+      ${JAR_PATH} BuildMetadataCppFromXml ${XML_FILE}
+      ${CMAKE_SOURCE_DIR}/src/phonenumbers ${METADATA_TYPE}
+
+    OUTPUT ${GEN_OUTPUT}
+    DEPENDS ${XML_FILE}
+  )
+  add_custom_target (
+    ${TARGET_NAME}
+    DEPENDS ${GEN_OUTPUT}
+    COMMENT "Generating Metadata code"
   )
-else (WIN32)
-  # TODO: add Windows support (define COMPILER_MSVC, OS_WIN)
-  list (
-    APPEND SOURCES
-    "src/base/synchronization/lock_impl_win.cc"
-    "src/base/threading/platform_thread_win.cc"
-    "src/base/threading/thread_local_win.cc"
+endfunction (add_metadata_gen_target)
+
+if (${USE_LITE_METADATA} STREQUAL "ON")
+  # Add the lite metadata generation target.
+  set (METADATA_TARGET "generate-lite-metadata")
+  add_metadata_gen_target (
+    ${METADATA_TARGET}
+    "${RESOURCES_DIR}/PhoneNumberMetadata.xml"
+    "lite_metadata"
+    "metadata"
   )
-  # TODO: Windows specific flags
+  list (APPEND SOURCES "src/phonenumbers/lite_metadata.cc")
+else ()
+  # Add the metadata generation target.
+  set (METADATA_TARGET "generate-metadata")
+  add_metadata_gen_target (
+    ${METADATA_TARGET}
+    "${RESOURCES_DIR}/PhoneNumberMetadata.xml"
+    "metadata"
+    "metadata"
+  )
+  list (APPEND SOURCES "src/phonenumbers/metadata.cc")
+endif ()
+
+# Add the test metadata generation target.
+set (TEST_METADATA_TARGET "generate-test-metadata")
+add_metadata_gen_target (
+  ${TEST_METADATA_TARGET}
+  "${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")
+  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)
+  add_definitions ("-Wall -Werror")
+endif ()
 
 include_directories ("src")
-                          
+
+# Build a static library (without -fPIC).
 add_library (phonenumber STATIC ${SOURCES})
-add_dependencies (phonenumber generate-sources)
+if (${USE_ICU_REGEXP} STREQUAL "ON")
+  if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
+    add_dependencies (phonenumber ${ALT_FORMAT_METADATA_TARGET})
+  endif ()
+endif ()
+
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  add_library (geocoding STATIC ${GEOCODING_SOURCES})
+  # 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).
+set (BUILD_SHARED_LIB true)
+
+if (${USE_RE2} STREQUAL "ON")
+  # RE2 is not always available as a shared library (e.g: package provided by
+  # Ubuntu) therefore disable the shared library build in this case.
+  if (${RE2_LIB} MATCHES ".*\\.a")
+    message (WARNING
+      "RE2 not available as a shared library, shared library build disabled")
+    set (BUILD_SHARED_LIB false)
+  endif ()
+endif ()
+
+if (BUILD_SHARED_LIB)
+  add_library (phonenumber-shared SHARED ${SOURCES})
+  if (${USE_ICU_REGEXP} STREQUAL "ON")
+    if (${USE_ALTERNATE_FORMATS} STREQUAL "ON")
+      add_dependencies (phonenumber ${ALT_FORMAT_METADATA_TARGET})
+    endif ()
+  endif ()
+  set_target_properties (phonenumber-shared
+    PROPERTIES
+      OUTPUT_NAME "phonenumber"
+      PREFIX "lib"
+      SOVERSION ${libphonenumber_VERSION_MAJOR}
+      VERSION ${libphonenumber_VERSION_MAJOR}.${libphonenumber_VERSION_MINOR})
+endif ()
+
+# Libraries used by both libphonenumber and libgeocoding.
+set (COMMON_DEPS ${ICU_LIB})
 
-target_link_libraries (phonenumber re2)
+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 COMMON_DEPS ${COREFOUNDATION_LIB} ${FOUNDATION_LIB})
+endif ()
+
+list (APPEND LIBRARY_DEPS ${COMMON_DEPS})
+
+target_link_libraries (phonenumber ${LIBRARY_DEPS})
+
+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})
+
+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"
+  )
+
+  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 ()
 
-# Tests
 
 set (TEST_SOURCES
-  "src/phonenumberutil_test.cc"
-  "src/re2_cache_test.cc"
-  "src/run_tests.cc"
-  "src/stringutil_test.cc"
+  "test/phonenumbers/asyoutypeformatter_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/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")
+  list (APPEND TEST_SOURCES "test/phonenumbers/phonenumbermatcher_test.cc")
+endif ()
+
+# Build the testing binary.
+include_directories ("test")
 add_executable (libphonenumber_test ${TEST_SOURCES})
+set (TEST_LIBS phonenumber_testing ${GTEST_LIB})
 
-target_link_libraries (libphonenumber_test phonenumber gtest pthread)
+if (NOT WIN32)
+  list (APPEND TEST_LIBS pthread)
+endif ()
+
+target_link_libraries (libphonenumber_test ${TEST_LIBS})
+
+# 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/shortnumberinfo.h"
+  "src/phonenumbers/unicodestring.h"
+  DESTINATION include/phonenumbers/
+)
+
+install (FILES "src/phonenumbers/utf/unicodetext.h"
+         DESTINATION include/phonenumbers/utf/)
+
+if (${USE_ICU_REGEXP} STREQUAL "ON")
+  # Install the phone number matcher headers.
+  install (FILES
+    "src/phonenumbers/phonenumbermatch.h"
+    "src/phonenumbers/phonenumbermatcher.h"
+    "src/phonenumbers/regexp_adapter.h"
+    DESTINATION include/phonenumbers/
+  )
+endif ()
+
+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/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/phonenumbers/base/synchronization/lock.h"
+         DESTINATION include/phonenumbers/base/synchronization/)
+
+install (TARGETS phonenumber LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if (BUILD_SHARED_LIB)
+  install (TARGETS phonenumber-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE
+           DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif ()
+
+if (${BUILD_GEOCODER} STREQUAL "ON")
+  install (TARGETS geocoding LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install (TARGETS geocoding-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE
+           DESTINATION ${CMAKE_INSTALL_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 ()