diff --git a/cpp/cmake_modules/FindGFlags.cmake b/cpp/cmake_modules/FindGFlags.cmake index 9eaf82497cd..63a55d75133 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()