qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1630881 - /qpid/proton/branches/examples/CMakeLists.txt
Date Fri, 10 Oct 2014 12:59:37 GMT
Author: gsim
Date: Fri Oct 10 12:59:37 2014
New Revision: 1630881

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

Modified:
    qpid/proton/branches/examples/CMakeLists.txt

Modified: qpid/proton/branches/examples/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/CMakeLists.txt?rev=1630881&r1=1630880&r2=1630881&view=diff
==============================================================================
--- qpid/proton/branches/examples/CMakeLists.txt (original)
+++ qpid/proton/branches/examples/CMakeLists.txt Fri Oct 10 12:59:37 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


Mime
View raw message