etch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vei...@apache.org
Subject svn commit: r1578896 - in /etch/trunk/examples/helloworld/cpp: CMakeLists.txt src/main/src/MainHelloWorldClient.cpp
Date Tue, 18 Mar 2014 13:51:44 GMT
Author: veithm
Date: Tue Mar 18 13:51:44 2014
New Revision: 1578896

URL: http://svn.apache.org/r1578896
Log:
Adding new paths for VLD to CMakeFile of HelloWorldTest

The structure of VLD has changed. Now it is needed to give more information.

Change-Id: I84bc5ceab38726c294756d2b5b37230af18761e7

Modified:
    etch/trunk/examples/helloworld/cpp/CMakeLists.txt
    etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp

Modified: etch/trunk/examples/helloworld/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/etch/trunk/examples/helloworld/cpp/CMakeLists.txt?rev=1578896&r1=1578895&r2=1578896&view=diff
==============================================================================
--- etch/trunk/examples/helloworld/cpp/CMakeLists.txt (original)
+++ etch/trunk/examples/helloworld/cpp/CMakeLists.txt Tue Mar 18 13:51:44 2014
@@ -85,10 +85,13 @@ IF (TARGET_OS STREQUAL "Linux")
 ELSEIF(TARGET_OS STREQUAL "Windows")
   target_link_libraries(etch-cpp-helloworld-server etch capu)
   IF (BUILD_CHECK_MEMORY)
+    add_definitions(-DBUILD_CHECK_MEMORY)
+    include_directories (${VLD}/include)
     file (COPY ${VLD}/vld.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
-    file (COPY ${VLD}/bin/dbghelp.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
-    file (COPY ${VLD}/bin/vld.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
-    target_link_libraries (etch-cpp-helloworld-server ${VLD}/lib/vld.lib)
+    file (COPY ${VLD}/bin/Win32/dbghelp.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+	file (COPY ${VLD}/bin/Win32/Microsoft.DTfW.DHL.manifest DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+    file (COPY ${VLD}/bin/Win32/vld_x86.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+    target_link_libraries (etch-cpp-helloworld-server ${VLD}/lib/Win32/vld.lib)
   ENDIF (BUILD_CHECK_MEMORY)
 ELSEIF(TARGET_OS STREQUAL "QNX")
   target_link_libraries (etch-cpp-helloworld-server etch capu c socket)
@@ -123,10 +126,13 @@ IF (TARGET_OS STREQUAL "Linux")
 ELSEIF(TARGET_OS STREQUAL "Windows")
   target_link_libraries(etch-cpp-helloworld-client etch capu )
   IF (BUILD_CHECK_MEMORY)
+    add_definitions(-DBUILD_CHECK_MEMORY)
+    include_directories (${VLD}/include)
     file (COPY ${VLD}/vld.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
-    file (COPY ${VLD}/bin/dbghelp.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
-    file (COPY ${VLD}/bin/vld.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
-    target_link_libraries (etch-cpp-helloworld-client ${VLD}/lib/vld.lib)
+    file (COPY ${VLD}/bin/Win32/dbghelp.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+	file (COPY ${VLD}/bin/Win32/Microsoft.DTfW.DHL.manifest DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+    file (COPY ${VLD}/bin/Win32/vld_x86.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+    target_link_libraries (etch-cpp-helloworld-client ${VLD}/lib/Win32/vld.lib)
   ENDIF (BUILD_CHECK_MEMORY)
 ELSEIF(TARGET_OS STREQUAL "QNX")
   target_link_libraries (etch-cpp-helloworld-client etch capu c socket)

Modified: etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp?rev=1578896&r1=1578895&r2=1578896&view=diff
==============================================================================
--- etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp (original)
+++ etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp Tue Mar 18 13:51:44
2014
@@ -14,6 +14,10 @@
 #include "transport/EtchTransportData.h"
 
 
+#ifdef BUILD_CHECK_MEMORY
+#include "vld.h"
+#endif
+
 using namespace org_apache_etch_examples_helloworld_HelloWorld;
 
 HelloWorldClient* MainHelloWorldClientFactory::newHelloWorldClient(RemoteHelloWorldServer*
server)



Mime
View raw message