This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new b804fda GEODE-4918: Fixed compile issues with .NET examples (#248)
b804fda is described below
commit b804fdae35e88e73e66df47bef8543aa4319a115
Author: Ivan Godwin <igod...@pivotal.io>
AuthorDate: Thu Mar 22 14:35:29 2018 -0700
GEODE-4918: Fixed compile issues with .NET examples (#248)
- Updated .net target version
- Added missing cmake requirement
---
clicache/CMakeLists.txt | 6 ++++--
examples/CMakeLists.txt | 2 ++
examples/cpp/CMakeLists.txt | 4 +++-
examples/cpp/customserializable/CMakeLists.txt | 3 +--
examples/cpp/customserializer/CMakeLists.txt | 3 +--
examples/cpp/put-get-remove/CMakeLists.txt | 3 +--
examples/dotnet/AuthInitialize/CMakeLists.txt | 7 +++----
examples/dotnet/CMakeLists.txt | 2 ++
examples/dotnet/PdxAutoSerializer/CMakeLists.txt | 7 +++----
examples/dotnet/PutGetRemove/CMakeLists.txt | 7 +++----
10 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/clicache/CMakeLists.txt b/clicache/CMakeLists.txt
index 9ea4f82..23a851b 100644
--- a/clicache/CMakeLists.txt
+++ b/clicache/CMakeLists.txt
@@ -12,9 +12,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-cmake_minimum_required(VERSION 3.4)
+
+cmake_minimum_required(VERSION 3.10)
+
project(clicache_src)
add_subdirectory(src)
add_subdirectory(test)
-add_subdirectory(integration-test)
+add_subdirectory(integration-test)
\ No newline at end of file
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e9494ee..6a9be68 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cmake_minimum_required(VERSION 3.10)
+
project(examples LANGUAGES NONE)
add_subdirectory(cpp)
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index 0d835d2..883a8b0 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -13,8 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cmake_minimum_required(VERSION 3.10)
+
project(examples LANGUAGES NONE)
add_subdirectory(customserializable)
add_subdirectory(customserializer)
-add_subdirectory(put-get-remove)
\ No newline at end of file
+add_subdirectory(put-get-remove)
diff --git a/examples/cpp/customserializable/CMakeLists.txt
b/examples/cpp/customserializable/CMakeLists.txt
index e0b1898..e87add3 100644
--- a/examples/cpp/customserializable/CMakeLists.txt
+++ b/examples/cpp/customserializable/CMakeLists.txt
@@ -33,5 +33,4 @@ add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PUBLIC
- GeodeNative::cpp
-)
+ GeodeNative::cpp)
diff --git a/examples/cpp/customserializer/CMakeLists.txt
b/examples/cpp/customserializer/CMakeLists.txt
index 3a4e4e2..23bf07a 100644
--- a/examples/cpp/customserializer/CMakeLists.txt
+++ b/examples/cpp/customserializer/CMakeLists.txt
@@ -34,5 +34,4 @@ add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PUBLIC
- GeodeNative::cpp
-)
+ GeodeNative::cpp)
diff --git a/examples/cpp/put-get-remove/CMakeLists.txt
b/examples/cpp/put-get-remove/CMakeLists.txt
index 4ba0d99..1750c5c 100644
--- a/examples/cpp/put-get-remove/CMakeLists.txt
+++ b/examples/cpp/put-get-remove/CMakeLists.txt
@@ -31,5 +31,4 @@ add_executable(${PROJECT_NAME} main.cpp)
target_link_libraries(${PROJECT_NAME}
PUBLIC
- GeodeNative::cpp
-)
+ GeodeNative::cpp)
diff --git a/examples/dotnet/AuthInitialize/CMakeLists.txt
b/examples/dotnet/AuthInitialize/CMakeLists.txt
index 56acd31..1b55eaf 100644
--- a/examples/dotnet/AuthInitialize/CMakeLists.txt
+++ b/examples/dotnet/AuthInitialize/CMakeLists.txt
@@ -28,7 +28,6 @@ add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
GeodeNative::dotnet)
-set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_REFERENCES
- "System"
- "${GeodeNative_DOTNET_LIBRARY}")
-
+set_target_properties(${PROJECT_NAME} PROPERTIES
+ VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
+ VS_DOTNET_REFERENCES "System;${GeodeNative_DOTNET_LIBRARY}")
diff --git a/examples/dotnet/CMakeLists.txt b/examples/dotnet/CMakeLists.txt
index ebfb6cf..68076ce 100644
--- a/examples/dotnet/CMakeLists.txt
+++ b/examples/dotnet/CMakeLists.txt
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+cmake_minimum_required(VERSION 3.10)
+
project(Apache.Geode.Examples LANGUAGES NONE)
add_subdirectory(AuthInitialize)
diff --git a/examples/dotnet/PdxAutoSerializer/CMakeLists.txt
b/examples/dotnet/PdxAutoSerializer/CMakeLists.txt
index 2be9b1d..989009f 100644
--- a/examples/dotnet/PdxAutoSerializer/CMakeLists.txt
+++ b/examples/dotnet/PdxAutoSerializer/CMakeLists.txt
@@ -28,7 +28,6 @@ add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
GeodeNative::dotnet)
-set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_REFERENCES
- "System"
- "${GeodeNative_DOTNET_LIBRARY}")
-
+set_target_properties(${PROJECT_NAME} PROPERTIES
+ VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
+ VS_DOTNET_REFERENCES "System;${GeodeNative_DOTNET_LIBRARY}")
diff --git a/examples/dotnet/PutGetRemove/CMakeLists.txt
b/examples/dotnet/PutGetRemove/CMakeLists.txt
index d5d3613..3e3329f 100644
--- a/examples/dotnet/PutGetRemove/CMakeLists.txt
+++ b/examples/dotnet/PutGetRemove/CMakeLists.txt
@@ -27,7 +27,6 @@ add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
GeodeNative::dotnet)
-set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_REFERENCES
- "System"
- "${GeodeNative_DOTNET_LIBRARY}")
-
+set_target_properties(${PROJECT_NAME} PROPERTIES
+ VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.5.2"
+ VS_DOTNET_REFERENCES "System;${GeodeNative_DOTNET_LIBRARY}")
--
To stop receiving notification emails like this one, please contact
jbarr...@apache.org.
