# HG changeset patch # User vnorilo # Date 1576501806 -7200 # Mon Dec 16 15:10:06 2019 +0200 # Node ID c91c4b77294cdda96af19aab2ada3a1b759bf0f7 # Parent eba1b7d7fa272fd58c551731a9494e3dd93dc268 namespace kronos repository to avoid conflict with the k3 project diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Debug, Release, RelWithDebInfo, MinSizeRel") set(KRONOS_BUILD_LLVM false CACHE BOOL "Download and build LLVM from source") set(COUCHBOT_USER "bot" CACHE STRING "Username for master database") -set(COUCHBOT_PASSWORD "NOT SET" CACHE STRING "Password for master database") +set(COUCHBOT_PASSWORD "" CACHE STRING "Password for master database") # Figure out how to configure sub-builds for single or multiplpe build configurations @@ -47,10 +47,10 @@ find_package(PythonInterp 2.7 REQUIRED) -set(KRONOS_REPOSITORY "https://hg.sr.ht/~vnorilo/kronos" CACHE STRING "Master repostiory for Kronos") +set(KRONOS_INTEGRATION_REPOSITORY "https://hg.sr.ht/~vnorilo/kronos" CACHE STRING "Master repostiory for Kronos") set(KRONOS_INTEGRATION_SERVER "" CACHE STRING "Optional CouchDB Database for continuous integration") -if (KRONOS_INTEGRATION_SERVER STREQUAL "") +if (NOT KRONOS_INTEGRATION_SERVER) message(STATUS "CouchBot credentials not entered. Configuring a simple SuperBuild") externalproject_add(kronos HG_REPOSITORY ${KRONOS_REPOSITORY} @@ -61,7 +61,7 @@ set(KRONOS_INTEGRATION_USER "" CACHE STRING "CouchDB username") set(KRONOS_INTEGRATION_PASSWORD "" CACHE STRING "CouchDB password") - message(STATUS "CouchBot credentials entered; starting BuildBot mode") + message(STATUS "CouchBot credentials entered (${COUCHBOT_USER}); starting BuildBot mode") set(COUCHBOT_CONFIG_FILE ${CMAKE_BINARY_DIR}/couchbot.json) @@ -78,7 +78,7 @@ file(WRITE ${CMAKE_BINARY_DIR}/config-template.json.in [=[{ "database": "${KRONOS_INTEGRATION_SERVER}", - "remote": "${KRONOS_REPOSITORY}", + "remote": "${KRONOS_INTEGRATION_REPOSITORY}", "user": "${KRONOS_INTEGRATION_USER}", "passwd": "${KRONOS_INTEGRATION_PASSWORD}", "cmake_args": ${COUCHBOT_CMAKE_ARGS},