summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2014-10-24 12:35:01 +0100
committerAsk Solem <ask@celeryproject.org>2014-10-24 12:35:01 +0100
commit185ce081e3efc846b476995b7da7297bb0eec82c (patch)
tree98adf852d24384b34b5a462907c2dce732c6821b /cmake
parentbe3000b4c84d7503f5ef4067de44ff16d060d158 (diff)
parent9626dd5cd5f78894f1416a1afd2d624ddd4904ae (diff)
downloadrabbitmq-c-github-ask-master.tar.gz
Merge branch 'alanxz/master'HEADmaster
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindPOPT.cmake6
-rw-r--r--cmake/config.h.in2
2 files changed, 6 insertions, 2 deletions
diff --git a/cmake/FindPOPT.cmake b/cmake/FindPOPT.cmake
index de29c7e..4242875 100644
--- a/cmake/FindPOPT.cmake
+++ b/cmake/FindPOPT.cmake
@@ -4,13 +4,15 @@
#
# POPT_FOUND - System has popt
# POPT_INCLUDE_DIR - The popt include directory
-# POPT_LIBRARIES - The libraries needed to use popt
+# POPT_LIBRARY - The libraries needed to use popt
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig QUIET)
-pkg_search_module(PC_POPT QUIET popt)
+if (PKG_CONFIG_FOUND)
+ pkg_search_module(PC_POPT QUIET popt)
+endif ()
# Find the include directories
FIND_PATH(POPT_INCLUDE_DIR
diff --git a/cmake/config.h.in b/cmake/config.h.in
index e7a83c4..7f3fa71 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -8,4 +8,6 @@
#cmakedefine HAVE_HTONLL
+#define AMQ_PLATFORM "@CMAKE_SYSTEM@"
+
#endif /* CONFIG_H */