Changeset 144670 for trunk/dports/devel


Ignore:
Timestamp:
Jan 15, 2016, 2:02:21 AM (3 years ago)
Author:
jeremyhu@…
Message:

libphonenumber-cpp: Don't use headers from an existing install (#49683)

Location:
trunk/dports/devel/libphonenumber-cpp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/libphonenumber-cpp/Portfile

    r144488 r144670  
    44PortSystem          1.0
    55PortGroup           cmake 1.0
    6 PortGroup           conflicts_build 1.0
    76PortGroup           github 1.0
    87
     
    4544                    port:protobuf-cpp
    4645
    47 conflicts_build     ${name}
    48 
    4946configure.args-append \
    5047                    -DGTEST_SOURCE_DIR=${gtest_srcdir} \
  • trunk/dports/devel/libphonenumber-cpp/files/patch-cpp-CMakeLists.txt.diff

    r126951 r144670  
    1 --- CMakeLists.txt.orig 2014-09-25 05:05:46.000000000 -0700
    2 +++ CMakeLists.txt      2014-10-17 09:59:32.000000000 -0700
    3 @@ -331,7 +331,7 @@
     1--- CMakeLists.txt.orig 2016-01-08 05:49:06.000000000 -0800
     2+++ CMakeLists.txt      2016-01-14 17:58:20.000000000 -0800
     3@@ -331,10 +331,10 @@ if (${USE_ICU_REGEXP} STREQUAL "ON")
    44 endif ()
    55 
     
    99 endif ()
    1010 
    11  include_directories ("src")
    12 @@ -414,8 +414,8 @@
     11-include_directories ("src")
     12+include_directories (BEFORE "src")
     13 
     14 # Build a static library (without -fPIC).
     15 add_library (phonenumber STATIC ${SOURCES})
     16@@ -414,8 +414,8 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
    1317   list (APPEND GEOCODER_DEPS ${COMMON_DEPS})
    1418   # Note that the subset of base/ on which the geocoder relies is implemented
     
    2125 
    2226 # Build a specific library for testing purposes.
     27@@ -474,7 +474,7 @@ if (${USE_ICU_REGEXP} STREQUAL "ON")
     28 endif ()
     29 
     30 # Build the testing binary.
     31-include_directories ("test")
     32+include_directories (BEFORE "test")
     33 add_executable (libphonenumber_test ${TEST_SOURCES})
     34 set (TEST_LIBS phonenumber_testing ${GTEST_LIB})
     35 
Note: See TracChangeset for help on using the changeset viewer.