mirror of
https://git.proxmox.com/git/libgit2
synced 2025-08-05 14:37:37 +00:00
Merge pull request #1027 from PaulThompson/cmake-flags-clean
Cmake flags clean
This commit is contained in:
commit
63e44d5e9b
@ -98,8 +98,7 @@ IF (MSVC)
|
|||||||
# Precompiled headers
|
# Precompiled headers
|
||||||
|
|
||||||
ELSE ()
|
ELSE ()
|
||||||
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g ${CMAKE_C_FLAGS}")
|
SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wmissing-prototypes ${CMAKE_C_FLAGS}")
|
||||||
SET(CMAKE_C_FLAGS "-O2 -g -D_GNU_SOURCE -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wmissing-prototypes ${CMAKE_C_FLAGS}")
|
|
||||||
IF (MINGW) # MinGW always does PIC and complains if we tell it to
|
IF (MINGW) # MinGW always does PIC and complains if we tell it to
|
||||||
STRING(REGEX REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
|
STRING(REGEX REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
|
||||||
ELSE ()
|
ELSE ()
|
||||||
@ -111,10 +110,15 @@ ELSE ()
|
|||||||
ENDIF ()
|
ENDIF ()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
# Build Debug by default
|
IF( NOT CMAKE_CONFIGURATION_TYPES )
|
||||||
IF (NOT CMAKE_BUILD_TYPE)
|
# Build Debug by default
|
||||||
SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
|
IF (NOT CMAKE_BUILD_TYPE)
|
||||||
ENDIF ()
|
SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
|
||||||
|
ENDIF ()
|
||||||
|
ELSE()
|
||||||
|
# Using a multi-configuration generator eg MSVC or Xcode
|
||||||
|
# that uses CMAKE_CONFIGURATION_TYPES and not CMAKE_BUILD_TYPE
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
IF (OPENSSL_FOUND)
|
IF (OPENSSL_FOUND)
|
||||||
ADD_DEFINITIONS(-DGIT_SSL)
|
ADD_DEFINITIONS(-DGIT_SSL)
|
||||||
|
Loading…
Reference in New Issue
Block a user