cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-14 06:49:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make EVENT_STAGE_NAME non cached

Browse Source 
It did not work before correctly anyway, since cmake do not reset cache
entries by default, so that reset to "beta" didn't work.

But I don't think that making this variable cached is useful, so let's
remove this.

(cherry picked from commit fe2c2622c389d7e9529b3c2fa828fb69cc985a1e)
This commit is contained in:
Azat Khuzhin 2017-01-29 20:19:06 +03:00 committed by Azat Khuzhin
parent 3a1f47fd1d
commit d9d11cb2e9
No known key found for this signature in database
GPG Key ID: B86086848EF8686D
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -76,25 +76,25 @@ set(EVENT_PACKAGE_VERSION
set(EVENT_NUMERIC_VERSION 0x02010800) set(EVENT_NUMERIC_VERSION 0x02010800)
# only a subset of names can be used, defaults to "beta" # only a subset of names can be used, defaults to "beta"
set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE} set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE})
CACHE STRING "set the stage name (beta|alpha|release)")
# a list that defines what can set for EVENT_STAGE_VERSION # a list that defines what can set for EVENT_STAGE_VERSION
set(EVENT__ALLOWED_STAGE_NAMES set(EVENT__ALLOWED_STAGE_NAMES
rc rc
beta beta
alpha alpha
release) alpha-dev
release
# attempt to find the EVENT__STAGE_VERSION in the allowed list stable
# of accepted stage names, the return value is stord in )
# EVENT__STAGE_RET list(
FIND EVENT__ALLOWED_STAGE_NAMES
list(FIND EVENT__ALLOWED_STAGE_NAMES "${EVENT_STAGE_NAME}"
${EVENT_STAGE_NAME} EVENT__STAGE_RET
EVENT__STAGE_RET) )
if (EVENT__STAGE_RET EQUAL -1)
if (EVENT__STAGE_RET EQUAL "-1") message(WARNING
"stage ${EVENT_STAGE_NAME} is not allowed, reset to beta")
set(EVENT_STAGE_NAME beta) set(EVENT_STAGE_NAME beta)
endif() endif()

3
README.md
View File

@ -77,9 +77,6 @@ EVENT__ENABLE_VERBOSE_DEBUG:BOOL=OFF
# on the the cross compilation target to verify that it works. See cmake # on the the cross compilation target to verify that it works. See cmake
# documentation for try_run for more details # documentation for try_run for more details
EVENT__FORCE_KQUEUE_CHECK:BOOL=OFF EVENT__FORCE_KQUEUE_CHECK:BOOL=OFF
# set EVENT_STAGE_VERSION
EVENT__STAGE_VERSION:STRING=beta
``` ```
__More variables can be found by running `cmake -LAH <sourcedir_path>`__ __More variables can be found by running `cmake -LAH <sourcedir_path>`__