You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2019/05/03 19:19:02 UTC
[qpid-dispatch] branch master updated: NO-JIRA: use cmake STRING
type to avoid implicit conversion warnings
This is an automated email from the ASF dual-hosted git repository.
chug pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new a02bda8 NO-JIRA: use cmake STRING type to avoid implicit conversion warnings
a02bda8 is described below
commit a02bda837bd545cefc7f32f8c47df45decc7304a
Author: Chuck Rolke <ch...@apache.org>
AuthorDate: Fri May 3 15:17:23 2019 -0400
NO-JIRA: use cmake STRING type to avoid implicit conversion warnings
---
CMakeLists.txt | 2 +-
router/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0853c3c..f892590 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
# Set default build type. Must use FORCE because project() sets default to ""
if (NOT CMAKE_BUILD_TYPE)
- set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE string
+ set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
"Build type: Debug, Release, RelWithDebInfo, MinSizeRel or Coverage (default RelWithDebInfo)" FORCE)
endif(NOT CMAKE_BUILD_TYPE)
if (CMAKE_BUILD_TYPE MATCHES "Deb|Cover")
diff --git a/router/CMakeLists.txt b/router/CMakeLists.txt
index 52e9ccc..659627a 100644
--- a/router/CMakeLists.txt
+++ b/router/CMakeLists.txt
@@ -18,7 +18,7 @@
##
-set(DEFAULT_CONFIG_PATH "${QPID_DISPATCH_CONFDIR}/qdrouterd.conf" CACHE string "Default config file path")
+set(DEFAULT_CONFIG_PATH "${QPID_DISPATCH_CONFDIR}/qdrouterd.conf" CACHE STRING "Default config file path")
set(DEFAULT_DISPATCH_PYTHON_DIR ${QPID_DISPATCH_PYTHON_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org