From: Adam Stokes <astokes(a)fedoraproject.org>
---
matahari.spec | 4 ++--
src/CMakeLists.txt | 6 +++---
src/cmake/modules/FindQPID.cmake | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/matahari.spec b/matahari.spec
index 66cca5f..7f26d16 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,5 +1,5 @@
-%global specversion 24
-%global upstream_version 8003b6c
+%global specversion 25
+%global upstream_version 598a300
# Keep around for when/if required
%global alphatag %{upstream_version}.git
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 877beb1..08608e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -153,10 +153,10 @@ target_link_libraries(mcommon ${SIGAR})
target_link_libraries(mhost ${SIGAR})
target_link_libraries(mnet ${SIGAR})
-string(REGEX REPLACE "\\." "" QPID_VERSION ${QPID_VERSION})
+# string(REGEX REPLACE "\\." "" QPID_VERSION ${QPID_VERSION})
-message("Building against: ${QPID_VERSION_LONG} (${QPID_VERSION} )")
-add_definitions(-DQPID_VERSION=${QPID_VERSION})
+# message("Building against: ${QPID_VERSION_LONG} (${QPID_VERSION} )")
+# add_definitions(-DQPID_VERSION=${QPID_VERSION})
set(regen_schema OFF)
message(STATUS "Regenerating QMF schemas: ${SCHEMAS}")
diff --git a/src/cmake/modules/FindQPID.cmake b/src/cmake/modules/FindQPID.cmake
index 1fc98b5..4cb0e89 100644
--- a/src/cmake/modules/FindQPID.cmake
+++ b/src/cmake/modules/FindQPID.cmake
@@ -130,6 +130,7 @@ else(MSVC)
else(WIN32)
find_file(QPIDD qpidd)
+ set(QPIDD false)
find_program(QMFGEN qmf-gen)
if(QPIDD)
execute_process(COMMAND ${QPIDD} --version OUTPUT_VARIABLE QPID_VERSION_LONG)
@@ -137,6 +138,7 @@ else(MSVC)
string(REGEX REPLACE "d \\(.*\\)" "" QPID_VERSION_LONG
${QPID_VERSION_LONG})
string(REGEX REPLACE ".* " "" QPID_VERSION
${QPID_VERSION_LONG})
else(QPIDD)
+ set(QPID_FIND_REQUIRED false)
if(QPID_FIND_REQUIRED)
message(FATAL_ERROR "Could not determine Qpid version, probably QPIDD
not installed")
endif(QPID_FIND_REQUIRED)
--
1.7.4
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari