diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dde85712c..716876e490 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ MARK_AS_ADVANCED(BUILD_CXX) MARK_AS_ADVANCED(DOWNLOAD_LOCATION) FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies.txt _Dependency_file) -FOREACH(DEPENDENCY Protobuf Gflags Glog cbc CoinUtils Osi Clp Cgl) +FOREACH(DEPENDENCY Protobuf gflags Glog cbc CoinUtils Osi Clp Cgl) STRING(REGEX REPLACE ".*${DEPENDENCY} = ([0-9.]+).*" "\\1" ${DEPENDENCY}_VERSION ${_Dependency_file}) ENDFOREACH() @@ -37,12 +37,12 @@ IF(BUILD_CXX) ENDIF() INCLUDE_DIRECTORIES(${Protobuf_INCLUDE_DIRS}) - FIND_PACKAGE(Gflags ${Gflags_VERSION} QUIET) - IF(NOT Gflags_FOUND) + FIND_PACKAGE(gflags ${gflags_VERSION} QUIET) + IF(NOT gflags_FOUND) MESSAGE(STATUS "Did not find system gflags. Building as an external project") INCLUDE(cmake/external/gflags.cmake) ENDIF() - INCLUDE_DIRECTORIES(${Gflags_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES(${gflags_INCLUDE_DIRS}) SET(GLOG_VERSION ${Glog_VERSION}) PKG_CHECK_MODULES(GLOG libglog>=${GLOG_VERSION}) @@ -96,7 +96,7 @@ IF(BUILD_CXX) ADD_LIBRARY(${PROJECT_NAME} SHARED ${SUBTARGETS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Cbc_LIBRARIES} - ${Gflags_LIBRARIES} + ${gflags_LIBRARIES} ${Protobuf_LIBRARIES} ${GLOG_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/Dependencies.txt b/Dependencies.txt index bf0a079956..03891c2d4a 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,8 +1,8 @@ Protobuf = 3.3.0 -Gflags = 2.2.0 +gflags = 2.2.0 Glog = 0.3.5 cbc = 2.9.8 CoinUtils = 2.10.13 Osi = 0.107.8 Clp = 1.16.10 -Cgl = 0.59.9 \ No newline at end of file +Cgl = 0.59.9 diff --git a/cmake/external/gflags.cmake b/cmake/external/gflags.cmake index 625a374d5c..1dc42a871a 100644 --- a/cmake/external/gflags.cmake +++ b/cmake/external/gflags.cmake @@ -1,10 +1,10 @@ -SET(Gflags_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/gflags_project/src/gflags/include/) -SET(Gflags_URL https://github.com/gflags/gflags) +SET(gflags_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/gflags_project/src/gflags/include/) +SET(gflags_URL https://github.com/gflags/gflags) -ExternalProject_Add(Gflags_project - PREFIX Gflags - GIT_REPOSITORY ${Gflags_URL} - GIT_TAG "v${Gflags_VERSION}" +ExternalProject_Add(gflags_project + PREFIX gflags + GIT_REPOSITORY ${gflags_URL} + GIT_TAG "v${gflags_VERSION}" DOWNLOAD_DIR "${DOWNLOAD_LOCATION}" UPDATE_COMMAND "" BUILD_IN_SOURCE 1 @@ -13,14 +13,14 @@ ExternalProject_Add(Gflags_project -DBUILD_STATIC_LIBS=ON -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON - ${Gflags_ADDITIONAL_CMAKE_OPTIONS} + ${gflags_ADDITIONAL_CMAKE_OPTIONS} INSTALL_COMMAND "" CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON) -ADD_LIBRARY(Gflags STATIC IMPORTED) -SET_PROPERTY(TARGET Gflags PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/gflags_project/src/gflags/lib/libgflags.a) -SET(Gflags_LIBRARIES "") -LIST(APPEND Gflags_LIBRARIES Gflags) +ADD_LIBRARY(gflags STATIC IMPORTED) +SET_PROPERTY(TARGET gflags PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/gflags_project/src/gflags/lib/libgflags.a) +SET(gflags_LIBRARIES "") +LIST(APPEND gflags_LIBRARIES gflags)