Repository: arrow Updated Branches: refs/heads/master b5e8a4831 -> 86c67d061
ARROW-1129: [C++] Fix gflags issue in Linux/macOS toolchain builds Minor regression introduced in #759 Author: Wes McKinney <wes.mckin...@twosigma.com> Closes #763 from wesm/ARROW-1129 and squashes the following commits: afc4bb6 [Wes McKinney] Fix gflags library name being searched for in toolchain builds on Linux/macOS Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/86c67d06 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/86c67d06 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/86c67d06 Branch: refs/heads/master Commit: 86c67d06146dee957c10e200a758be07c85da2d6 Parents: b5e8a48 Author: Wes McKinney <wes.mckin...@twosigma.com> Authored: Tue Jun 20 14:05:12 2017 +0200 Committer: Uwe L. Korn <uw...@xhochy.com> Committed: Tue Jun 20 14:05:12 2017 +0200 ---------------------------------------------------------------------- cpp/cmake_modules/FindGFlags.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/86c67d06/cpp/cmake_modules/FindGFlags.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/FindGFlags.cmake b/cpp/cmake_modules/FindGFlags.cmake index 9eaf824..63a55d7 100644 --- a/cpp/cmake_modules/FindGFlags.cmake +++ b/cpp/cmake_modules/FindGFlags.cmake @@ -33,6 +33,12 @@ if (MSVC AND NOT GFLAGS_MSVC_STATIC_LIB_SUFFIX) set(GFLAGS_MSVC_STATIC_LIB_SUFFIX "_static") endif() +set(GFLAGS_STATIC_LIB_SUFFIX + "${GFLAGS_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + +set(GFLAGS_STATIC_LIB_NAME + ${CMAKE_STATIC_LIBRARY_PREFIX}gflags${GFLAGS_STATIC_LIB_SUFFIX}) + if ( _gflags_roots ) find_path(GFLAGS_INCLUDE_DIR NAMES gflags/gflags.h PATHS ${_gflags_roots} @@ -42,7 +48,7 @@ if ( _gflags_roots ) PATHS ${_gflags_roots} NO_DEFAULT_PATH PATH_SUFFIXES "lib" ) - find_library(GFLAGS_STATIC_LIB NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}gflags${GFLAGS_MSVC_STATIC_LIB_SUFFIX} + find_library(GFLAGS_STATIC_LIB NAMES ${GFLAGS_STATIC_LIB_NAME} PATHS ${_gflags_roots} NO_DEFAULT_PATH PATH_SUFFIXES "lib" ) @@ -54,7 +60,7 @@ else() find_library(GFLAGS_SHARED_LIB gflags NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) - find_library(GFLAGS_STATIC_LIB ${CMAKE_STATIC_LIBRARY_PREFIX}gflags${GFLAGS_MSVC_STATIC_LIB_SUFFIX} + find_library(GFLAGS_STATIC_LIB ${GFLAGS_STATIC_LIB_NAME} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) endif()
