From 5be2b599573f65a88562ee623aeb827c3fc6e7ae Mon Sep 17 00:00:00 2001 From: "dbeaumont@google.com" Date: Fri, 20 Jul 2012 14:30:44 +0000 Subject: [PATCH] Modified cmake rules to generate alternate format metadata files. git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@508 ee073f10-1060-11df-b6a4-87a95322a99c --- cpp/CMakeLists.txt | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 6bfed5e..7a51687 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -184,7 +184,6 @@ set ( "src/phonenumbers/geocoding/geocoding_data.cc" "src/phonenumbers/geocoding/mapping_file_provider.cc" "src/phonenumbers/logger.cc" - "src/phonenumbers/metadata.h" # Generated by build tools. "src/phonenumbers/phonemetadata.pb.cc" # Generated by Protocol Buffers. "src/phonenumbers/phonenumber.cc" "src/phonenumbers/phonenumber.pb.cc" # Generated by Protocol Buffers. @@ -213,6 +212,7 @@ if (${USE_ICU_REGEXP} STREQUAL "ON") add_definitions (-DUSE_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") endif () @@ -227,10 +227,11 @@ set (TESTING_LIBRARY_SOURCES ${SOURCES}) # code generation targets. function (add_metadata_gen_target TARGET_NAME XML_FILE - METADATA_TYPE) + 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.h") + "${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") @@ -256,6 +257,7 @@ if (${USE_LITE_METADATA} STREQUAL "ON") ${METADATA_TARGET} "${RESOURCES_DIR}/PhoneNumberMetaData.xml" "lite_metadata" + "metadata" ) list (APPEND SOURCES "src/phonenumbers/lite_metadata.cc") else () @@ -265,6 +267,7 @@ else () ${METADATA_TARGET} "${RESOURCES_DIR}/PhoneNumberMetaData.xml" "metadata" + "metadata" ) list (APPEND SOURCES "src/phonenumbers/metadata.cc") endif () @@ -275,9 +278,21 @@ add_metadata_gen_target ( ${TEST_METADATA_TARGET} "${RESOURCES_DIR}/PhoneNumberMetaDataForTesting.xml" "test_metadata" + "metadata" ) list (APPEND TESTING_LIBRARY_SOURCES "src/phonenumbers/test_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" + ) +endif () + if (NOT WIN32) add_definitions ("-Wall -Werror") endif () @@ -287,6 +302,9 @@ 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}) +endif () # Build a shared library (with -fPIC). set (BUILD_SHARED_LIB true) @@ -304,6 +322,9 @@ 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}) + endif () set_target_properties (phonenumber-shared PROPERTIES OUTPUT_NAME "phonenumber" -- 2.7.4