Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58A0B7E62 for ; Thu, 3 Nov 2011 21:19:26 +0000 (UTC) Received: (qmail 78435 invoked by uid 500); 3 Nov 2011 21:19:26 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 78407 invoked by uid 500); 3 Nov 2011 21:19:26 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 78400 invoked by uid 99); 3 Nov 2011 21:19:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 21:19:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 21:19:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1EB5F2388860 for ; Thu, 3 Nov 2011 21:19:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1197313 - /qpid/branches/0.14/qpid/cpp/src/CMakeLists.txt Date: Thu, 03 Nov 2011 21:19:05 -0000 To: commits@qpid.apache.org From: astitcher@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111103211905.1EB5F2388860@eris.apache.org> Author: astitcher Date: Thu Nov 3 21:19:04 2011 New Revision: 1197313 URL: http://svn.apache.org/viewvc?rev=1197313&view=rev Log: QPID-3464: Build Improvements (CMake) - Fixed windows build Modified: qpid/branches/0.14/qpid/cpp/src/CMakeLists.txt Modified: qpid/branches/0.14/qpid/cpp/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/qpid/branches/0.14/qpid/cpp/src/CMakeLists.txt?rev=1197313&r1=1197312&r2=1197313&view=diff ============================================================================== --- qpid/branches/0.14/qpid/cpp/src/CMakeLists.txt (original) +++ qpid/branches/0.14/qpid/cpp/src/CMakeLists.txt Thu Nov 3 21:19:04 2011 @@ -460,12 +460,14 @@ else (NOT CLOCK_GETTIME_IN_RT) set(QPID_HAS_CLOCK_GETTIME YES CACHE BOOL "Platform has clock_gettime") endif (NOT CLOCK_GETTIME_IN_RT) -# Ensure that we have uuid library -CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID) -CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H) -IF (NOT HAVE_UUID AND NOT HAVE_UUID_H) - message(FATAL_ERROR "Uuid library and/or header file not found") -ENDIF (NOT HAVE_UUID AND NOT HAVE_UUID_H) +# If not windows ensure that we have uuid library +if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) + CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID) + CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H) + if (NOT HAVE_UUID AND NOT HAVE_UUID_H) + message(FATAL_ERROR "Uuid library and/or header file not found") + endif (NOT HAVE_UUID AND NOT HAVE_UUID_H) +endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) # See if Cyrus SASL is desired and available CHECK_LIBRARY_EXISTS (sasl2 sasl_checkpass "" HAVE_SASL) --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org