Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@qpid.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1628523 - /qpid/proton/trunk/CMakeLists.txt
Date: Tue, 30 Sep 2014 19:46:27 -0000
To: commits@qpid.apache.org
From: astitcher@apache.org
Message-Id: <20140930194627.A454423889D5@eris.apache.org>

Author: astitcher
Date: Tue Sep 30 19:46:27 2014
New Revision: 1628523

URL: http://svn.apache.org/r1628523
Log:
NO-JIRA: Fix broken CMake initialisation of BUILD_WITH_CXX

Modified:
    qpid/proton/trunk/CMakeLists.txt

Modified: qpid/proton/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/CMakeLists.txt?rev=1628523&r1=1628522&r2=1628523&view=diff
==============================================================================
--- qpid/proton/trunk/CMakeLists.txt (original)
+++ qpid/proton/trunk/CMakeLists.txt Tue Sep 30 19:46:27 2014
@@ -26,11 +26,12 @@ if (CMAKE_BUILD_TYPE MATCHES "Deb")
 endif (CMAKE_BUILD_TYPE MATCHES "Deb")
 message(STATUS "Build type is \"${CMAKE_BUILD_TYPE}\"${has_debug_symbols}")
 
-option(BUILD_WITH_CXX "Compile Proton using C++" OFF)
-if ("${CMAKE_GENERATOR}" MATCHES "^Visual Studio")
+
+if (MSVC)
   # No C99 capability, use C++
-  set(BUILD_WITH_CXX ON)
-endif ("${CMAKE_GENERATOR}" MATCHES "^Visual Studio")
+  set(DEFAULT_BUILD_WITH_CXX ON)
+endif (MSVC)
+option(BUILD_WITH_CXX "Compile Proton using C++" ${DEFAULT_BUILD_WITH_CXX})
 
 if (BUILD_WITH_CXX)
   project (Proton C CXX)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org