tqcq/CPM.cmake
0
0
Fork 0
mirror of https://github.com/cpm-cmake/CPM.cmake.git synced 2025-11-18 07:07:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

default to "ON" for options without explicit value definition (#96)

Browse Source 
* default to "ON" for options without explicit value definition

* increment CPM version

* compare the correct lengths
This commit is contained in:
Lars Melchior
2020-02-06 11:50:55 +01:00
committed by GitHub
parent f8d4e959bb
commit 775a235880
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/CPM.cmake
View File

@@ -28,7 +28,7 @@
cmake_minimum_required(VERSION 3.14 FATAL_ERROR) cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
set(CURRENT_CPM_VERSION 0.15.1) set(CURRENT_CPM_VERSION 0.16)
if(CPM_DIRECTORY) if(CPM_DIRECTORY)
if(NOT ${CPM_DIRECTORY} MATCHES ${CMAKE_CURRENT_LIST_DIR}) if(NOT ${CPM_DIRECTORY} MATCHES ${CMAKE_CURRENT_LIST_DIR})
@@ -303,9 +303,15 @@ endfunction()
# splits a package option # splits a package option
function(cpm_parse_option OPTION) function(cpm_parse_option OPTION)
string(REGEX MATCH "^[^ ]+" OPTION_KEY ${OPTION}) string(REGEX MATCH "^[^ ]+" OPTION_KEY ${OPTION})
string(LENGTH ${OPTION} OPTION_LENGTH)
string(LENGTH ${OPTION_KEY} OPTION_KEY_LENGTH) string(LENGTH ${OPTION_KEY} OPTION_KEY_LENGTH)
math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1") if (OPTION_KEY_LENGTH STREQUAL OPTION_LENGTH)
string(SUBSTRING ${OPTION} "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE) # no value for key provided, assume user wants to set option to "ON"
set(OPTION_VALUE "ON")
else()
math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1")
string(SUBSTRING ${OPTION} "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE)
endif()
set(OPTION_KEY "${OPTION_KEY}" PARENT_SCOPE) set(OPTION_KEY "${OPTION_KEY}" PARENT_SCOPE)
set(OPTION_VALUE "${OPTION_VALUE}" PARENT_SCOPE) set(OPTION_VALUE "${OPTION_VALUE}" PARENT_SCOPE)
endfunction() endfunction()

2
examples/gtest/CMakeLists.txt
View File

@@ -23,7 +23,7 @@ CPMAddPackage(
VERSION 1.8.1 VERSION 1.8.1
OPTIONS OPTIONS
"INSTALL_GTEST OFF" "INSTALL_GTEST OFF"
"gtest_force_shared_crt ON" "gtest_force_shared_crt"
) )
# ---- Create binary ---- # ---- Create binary ----