Author: chug
Date: Sun Sep 14 01:15:53 2014
New Revision: 1624795

URL: http://svn.apache.org/r1624795
Log:
QPID-4575: VS2012 - fix cmake to allow in-source build where dirs source == 
binary

Modified:
    qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt?rev=1624795&r1=1624794&r2=1624795&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt Sun Sep 14 01:15:53 
2014
@@ -150,8 +150,12 @@ if (MSVC)
     file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR}       DOTNET_projectSourceDir)
 
     # relative path from top-level binary back to top-level source
-    file(RELATIVE_PATH DOTNET_relPathToSrc "${CMAKE_CURRENT_BINARY_DIR}" 
"${CMAKE_CURRENT_SOURCE_DIR}")
-    file(TO_NATIVE_PATH ${DOTNET_relPathToSrc} DOTNET_relPathToSrc)
+    if (${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+        set (DOTNET_relPathToSrc ".\\")
+    else()
+        file(RELATIVE_PATH DOTNET_relPathToSrc "${CMAKE_CURRENT_BINARY_DIR}" 
"${CMAKE_CURRENT_SOURCE_DIR}")
+        file(TO_NATIVE_PATH ${DOTNET_relPathToSrc} DOTNET_relPathToSrc)
+    endif()
 
     if((${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008") OR
        (${CMAKE_GENERATOR} STREQUAL "Visual Studio 9 2008 Win64"))



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

Reply via email to