From 58345b18d92892a170d61a76c5dd2d290413bdd7 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Fri, 3 Apr 2015 16:12:38 +0100 Subject: [PATCH] #113 Require CMake >= 2.8.12 Earlier version, such as CMake 2.8.11.2 in particular, have incomplete or faulty support of target_include_directories generator expressions. Moreover, this allows us to assume that the command target_include_directories is available. --- CMakeLists.txt | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 778bb86..c32bce3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.4 FATAL_ERROR) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) if (POLICY CMP0042) cmake_policy (SET CMP0042 NEW) @@ -263,13 +263,6 @@ configure_headers (PUBLIC_HDRS ${PUBLIC_HDRS}) configure_sources (PRIVATE_HDRS ${PRIVATE_HDRS}) configure_sources (GFLAGS_SRCS ${GFLAGS_SRCS}) -# deprecated declaration of include directories for older CMake versions -if (NOT COMMAND target_include_directories) - include_directories ("${PROJECT_SOURCE_DIR}/src") - include_directories ("${PROJECT_BINARY_DIR}/include") - include_directories ("${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}") -endif () - # ---------------------------------------------------------------------------- # output directories set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin") @@ -316,16 +309,14 @@ foreach (TYPE IN ITEMS STATIC SHARED) foreach (opts IN ITEMS "" _nothreads) if (BUILD_gflags${opts}_LIB) add_library (gflags${opts}-${type} ${TYPE} ${GFLAGS_SRCS} ${PRIVATE_HDRS} ${PUBLIC_HDRS}) - if (COMMAND target_include_directories) - set (include_dirs "$") - if (INSTALL_HEADERS) - list (APPEND include_dirs "$") - endif () - target_include_directories (gflags${opts}-${type} - PUBLIC "${include_dirs}" - PRIVATE "${PROJECT_SOURCE_DIR}/src;${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}" - ) + set (include_dirs "$") + if (INSTALL_HEADERS) + list (APPEND include_dirs "$") endif () + target_include_directories (gflags${opts}-${type} + PUBLIC "${include_dirs}" + PRIVATE "${PROJECT_SOURCE_DIR}/src;${PROJECT_BINARY_DIR}/include/${GFLAGS_INCLUDE_DIR}" + ) if (opts MATCHES "nothreads") set (defines "GFLAGS_IS_A_DLL=${GFLAGS_IS_A_DLL};NOTHREADS") else () -- 2.7.4