You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/03/15 17:51:05 UTC
[04/34] geode-native git commit: GEODE-2636: Switch to CMake variable
for library name.
GEODE-2636: Switch to CMake variable for library name.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/db9d541c
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/db9d541c
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/db9d541c
Branch: refs/heads/feature/GEODE-2602
Commit: db9d541c6ca64231f5f48ca4ef35dedb0a13166b
Parents: 1176dee
Author: Sarge <md...@pivotal.io>
Authored: Wed Mar 8 14:28:52 2017 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Mar 9 13:14:37 2017 -0800
----------------------------------------------------------------------
src/quickstart/cpp/CMakeLists.txt | 6 +++---
src/quickstart/cpp/PdxSerializer.cpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/db9d541c/src/quickstart/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/CMakeLists.txt b/src/quickstart/cpp/CMakeLists.txt
index 9c6d60c..e02e4c2 100644
--- a/src/quickstart/cpp/CMakeLists.txt
+++ b/src/quickstart/cpp/CMakeLists.txt
@@ -56,12 +56,12 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}")
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}")
if (${WIN32})
- set(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/apache-geode${CMAKE_IMPORT_LIBRARY_SUFFIX}")
+ set(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/${PRODUCT_DLL_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}")
- file(COPY ${NATIVECLIENT_BINARIES_DIR}/apache-geode.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ file(COPY ${NATIVECLIENT_BINARIES_DIR}/${PRODUCT_DLL_NAME}.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
set(RUNCPP "runcpp.bat")
else ()
- get_filename_component(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}apache-geode${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
+ get_filename_component(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}${PRODUCT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
set(RUNCPP "runcpp.sh")
endif()
http://git-wip-us.apache.org/repos/asf/geode-native/blob/db9d541c/src/quickstart/cpp/PdxSerializer.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/PdxSerializer.cpp b/src/quickstart/cpp/PdxSerializer.cpp
index a99f53d..54ae8e7 100644
--- a/src/quickstart/cpp/PdxSerializer.cpp
+++ b/src/quickstart/cpp/PdxSerializer.cpp
@@ -165,15 +165,15 @@ int main(int argc, char** argv) {
LOGINFO("Registered Person Query Objects");
// Populate the Region with some Person objects.
- Person* p1 = new Person("John", 1 /*ID*/, 23 /*age*/);
+ Person* p1 = new Person((char *)"John", 1 /*ID*/, 23 /*age*/);
PdxWrapperPtr pdxobj1(new PdxWrapper(p1, CLASSNAME));
regionPtr->put("Key1", pdxobj1);
- Person* p2 = new Person("Jack", 2 /*ID*/, 20 /*age*/);
+ Person* p2 = new Person((char *)"Jack", 2 /*ID*/, 20 /*age*/);
PdxWrapperPtr pdxobj2(new PdxWrapper(p2, CLASSNAME));
regionPtr->put("Key2", pdxobj2);
- Person* p3 = new Person("Tony", 3 /*ID*/, 35 /*age*/);
+ Person* p3 = new Person((char *)"Tony", 3 /*ID*/, 35 /*age*/);
PdxWrapperPtr pdxobj3(new PdxWrapper(p3, CLASSNAME));
regionPtr->put("Key3", pdxobj3);