Browse Source

Fixing cmake issues:

- using reserved keyword "test" in the custom target
 - bumping up the makefile version to avoid issues with policy changes
   relating to rpath
pull/975/head
lararennie 10 years ago
committed by Fredrik Roubert
parent
commit
15084a993a
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      cpp/CMakeLists.txt

+ 3
- 3
cpp/CMakeLists.txt View File

@ -14,7 +14,7 @@
# Author: Philippe Liard
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 3.1)
project (libphonenumber)
set (libphonenumber_VERSION_MAJOR 7)
@ -489,13 +489,13 @@ 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
add_custom_target (tests
COMMAND generate_geocoding_data_test
COMMAND libphonenumber_test
DEPENDS generate_geocoding_data_test libphonenumber_test
)
else ()
add_custom_target (test
add_custom_target (tests
COMMAND libphonenumber_test
DEPENDS libphonenumber_test
)


Loading…
Cancel
Save