Skip to content

Commit e23b8b4

Browse files
authored
Merge pull request libgit2#5422 from pks-t/pks/cmake-booleans
CMake booleans
2 parents 8eb1fc3 + d8e71cb commit e23b8b4

File tree

5 files changed

+30
-1
lines changed

5 files changed

+30
-1
lines changed

cmake/Modules/SanitizeBool.cmake

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FUNCTION(SanitizeBool VAR)
2+
STRING(TOLOWER "${${VAR}}" VALUE)
3+
IF(VALUE STREQUAL "on")
4+
SET(${VAR} "ON" PARENT_SCOPE)
5+
ELSEIF(VALUE STREQUAL "yes")
6+
SET(${VAR} "ON" PARENT_SCOPE)
7+
ELSEIF(VALUE STREQUAL "true")
8+
SET(${VAR} "ON" PARENT_SCOPE)
9+
ELSEIF(VALUE STREQUAL "1")
10+
SET(${VAR} "ON" PARENT_SCOPE)
11+
ELSEIF(VALUE STREQUAL "off")
12+
SET(${VAR} "OFF" PARENT_SCOPE)
13+
ELSEIF(VALUE STREQUAL "no")
14+
SET(${VAR} "OFF" PARENT_SCOPE)
15+
ELSEIF(VALUE STREQUAL "false")
16+
SET(${VAR} "OFF" PARENT_SCOPE)
17+
ELSEIF(VALUE STREQUAL "0")
18+
SET(${VAR} "OFF" PARENT_SCOPE)
19+
ENDIF()
20+
ENDFUNCTION()

cmake/Modules/SelectGSSAPI.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
# We try to find any packages our backends might use
44

5+
INCLUDE(SanitizeBool)
6+
57
FIND_PACKAGE(GSSAPI)
68
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
79
INCLUDE(FindGSSFramework)
810
ENDIF()
911

1012
# Auto-select GSS backend
13+
SanitizeBool(USE_GSSAPI)
1114
IF (USE_GSSAPI STREQUAL ON)
1215
IF (GSSFRAMEWORK_FOUND)
1316
SET(GSS_BACKEND "GSS.framework")

cmake/Modules/SelectHTTPSBackend.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Select the backend to use
22

3+
INCLUDE(SanitizeBool)
4+
35
# We try to find any packages our backends might use
46
FIND_PACKAGE(OpenSSL)
57
FIND_PACKAGE(mbedTLS)
@@ -9,6 +11,7 @@ IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
911
ENDIF()
1012

1113
# Auto-select TLS backend
14+
SanitizeBool(USE_HTTPS)
1215
IF (USE_HTTPS STREQUAL ON)
1316
IF (SECURITY_FOUND)
1417
IF (SECURITY_HAS_SSLCREATECONTEXT)

cmake/Modules/SelectHashes.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Select a hash backend
22

3+
INCLUDE(SanitizeBool)
4+
35
# USE_SHA1=CollisionDetection(ON)/HTTPS/Generic/OFF
46

7+
SanitizeBool(USE_SHA1)
58
IF(USE_SHA1 STREQUAL ON OR USE_SHA1 STREQUAL "CollisionDetection")
69
SET(SHA1_BACKEND "CollisionDetection")
710
ELSEIF(USE_SHA1 STREQUAL "HTTPS")

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SET(LIB_INSTALL_DIR lib CACHE PATH "Where to install libraries to.")
2828
SET(INCLUDE_INSTALL_DIR include CACHE PATH "Where to install headers to.")
2929

3030
# Enable tracing
31-
IF (ENABLE_TRACE STREQUAL "ON")
31+
IF(ENABLE_TRACE)
3232
SET(GIT_TRACE 1)
3333
ENDIF()
3434
ADD_FEATURE_INFO(tracing GIT_TRACE "tracing support")

0 commit comments

Comments
 (0)