proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-07 09:54:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2275 from jacquesg/apple-warning

Browse Source 
Check for compiler flag support instead of checking for a platform
This commit is contained in:
Russell Belfer 2014-04-21 09:50:43 -07:00
commit 28750a7d98
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -18,6 +18,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/") SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/")
INCLUDE(CheckLibraryExists) INCLUDE(CheckLibraryExists)
INCLUDE(AddCFlagIfSupported)
# Build options # Build options
# #
@ -287,7 +288,7 @@ IF (MSVC)
# Precompiled headers # Precompiled headers
ELSE () ELSE ()
SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wdeclaration-after-statement ${CMAKE_C_FLAGS}") SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall -Wextra ${CMAKE_C_FLAGS}")
IF (WIN32 AND NOT CYGWIN) IF (WIN32 AND NOT CYGWIN)
SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG") SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG")
@ -301,16 +302,22 @@ ELSE ()
ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1) ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1)
ELSEIF (BUILD_SHARED_LIBS) ELSEIF (BUILD_SHARED_LIBS)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fPIC") ADD_C_FLAG_IF_SUPPORTED(-fvisibility=hidden)
ENDIF ()
IF (APPLE) # Apple deprecated OpenSSL
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
# With clang, disable some annoying extra warnings SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
IF (NOT CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-const-variable -Wno-unused-function")
ENDIF()
ENDIF () ENDIF ()
ADD_C_FLAG_IF_SUPPORTED(-Wno-missing-field-initializers)
ADD_C_FLAG_IF_SUPPORTED(-Wstrict-aliasing=2)
ADD_C_FLAG_IF_SUPPORTED(-Wstrict-prototypes)
ADD_C_FLAG_IF_SUPPORTED(-Wdeclaration-after-statement)
ADD_C_FLAG_IF_SUPPORTED(-Wno-unused-const-variable)
ADD_C_FLAG_IF_SUPPORTED(-Wno-unused-function)
IF (APPLE) # Apple deprecated OpenSSL
ADD_C_FLAG_IF_SUPPORTED(-Wno-deprecated-declarations)
ENDIF()
IF (PROFILE) IF (PROFILE)
SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}") SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}")
SET(CMAKE_EXE_LINKER_FLAGS "-pg ${CMAKE_EXE_LINKER_FLAGS}") SET(CMAKE_EXE_LINKER_FLAGS "-pg ${CMAKE_EXE_LINKER_FLAGS}")
@ -335,7 +342,7 @@ ENDIF()
IF (THREADSAFE) IF (THREADSAFE)
IF (NOT WIN32) IF (NOT WIN32)
find_package(Threads REQUIRED) FIND_PACKAGE(Threads REQUIRED)
ENDIF() ENDIF()
ADD_DEFINITIONS(-DGIT_THREADS) ADD_DEFINITIONS(-DGIT_THREADS)
@ -366,7 +373,7 @@ IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 4) ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 4)
ADD_DEFINITIONS(-DGIT_ARCH_32) ADD_DEFINITIONS(-DGIT_ARCH_32)
ELSE() ELSE()
message(FATAL_ERROR "Unsupported architecture") MESSAGE(FATAL_ERROR "Unsupported architecture")
ENDIF() ENDIF()
# Compile and link libgit2 # Compile and link libgit2
@ -455,7 +462,7 @@ ENDIF ()
IF (TAGS) IF (TAGS)
FIND_PROGRAM(CTAGS ctags) FIND_PROGRAM(CTAGS ctags)
IF (NOT CTAGS) IF (NOT CTAGS)
message(FATAL_ERROR "Could not find ctags command") MESSAGE(FATAL_ERROR "Could not find ctags command")
ENDIF () ENDIF ()
FILE(GLOB_RECURSE SRC_ALL *.[ch]) FILE(GLOB_RECURSE SRC_ALL *.[ch])

16
cmake/Modules/AddCFlagIfSupported.cmake Normal file
View File

@ -0,0 +1,16 @@
# - Append compiler flag to CMAKE_C_FLAGS if compiler supports it
# ADD_C_FLAG_IF_SUPPORTED(<flag>)
# <flag> - the compiler flag to test
# This internally calls the CHECK_C_COMPILER_FLAG macro.
INCLUDE(CheckCCompilerFlag)
MACRO(ADD_C_FLAG_IF_SUPPORTED _FLAG)
STRING(TOUPPER ${_FLAG} UPCASE)
STRING(REGEX REPLACE "^-" "" UPCASE_PRETTY ${UPCASE})
CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED)
IF(IS_${UPCASE_PRETTY}_SUPPORTED)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FLAG}")
ENDIF()
ENDMACRO()