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 94f5c3b  Update cmake version to 3.12 for CLI projects (#322)
94f5c3b is described below

commit 94f5c3b857a7fb9e5abf62378a63ba46953209d9
Author: Blake Bender <[email protected]>
AuthorDate: Fri Jul 27 15:40:02 2018 +0000

    Update cmake version to 3.12 for CLI projects (#322)
    
    * cmake install switched to 'latest' (3.12)
    
    Co-authored-by: Ivan Godwin <[email protected]>
---
 CMakeLists.txt                            | 1 -
 clicache/integration-test2/CMakeLists.txt | 1 +
 clicache/src/CMakeLists.txt               | 1 +
 clicache/test/CMakeLists.txt              | 1 +
 clicache/test2/CMakeLists.txt             | 1 +
 5 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5ef8e4..8df6632 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,7 +253,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   # Interface for C++/CLI language.
   add_library(c++cli INTERFACE)
   target_compile_options(c++cli INTERFACE
-    /clr
     /EHa)
 
   target_compile_options(_WarningsAsError INTERFACE
diff --git a/clicache/integration-test2/CMakeLists.txt 
b/clicache/integration-test2/CMakeLists.txt
index 58150bb..cf1a697 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/integration-test2/CMakeLists.txt
@@ -58,6 +58,7 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 set_target_properties( ${PROJECT_NAME} PROPERTIES
+  COMMON_LANGUAGE_RUNTIME ""
   VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
   VS_GLOBAL_TreatWarningsAsErrors True
   VS_GLOBAL_TestProjectType UnitTest
diff --git a/clicache/src/CMakeLists.txt b/clicache/src/CMakeLists.txt
index b510478..756dbba 100644
--- a/clicache/src/CMakeLists.txt
+++ b/clicache/src/CMakeLists.txt
@@ -302,6 +302,7 @@ add_library(${PROJECT_NAME} SHARED
 )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
+  COMMON_LANGUAGE_RUNTIME "" 
   OUTPUT_NAME ${PRODUCT_DLL_NAME}
   VS_GLOBAL_CLRSupport "true"
   VS_GLOBAL_KEYWORD "ManagedCProj"
diff --git a/clicache/test/CMakeLists.txt b/clicache/test/CMakeLists.txt
index ef6d71c..cd73517 100644
--- a/clicache/test/CMakeLists.txt
+++ b/clicache/test/CMakeLists.txt
@@ -33,6 +33,7 @@ add_library(Apache.Geode.Test MODULE
 )
 
 set_target_properties(Apache.Geode.Test PROPERTIES
+  COMMON_LANGUAGE_RUNTIME "" 
   VS_GLOBAL_CLRSupport "true"
   VS_GLOBAL_KEYWORD "ManagedCProj"
   VS_GLOBAL_TestProjectType UnitTest
diff --git a/clicache/test2/CMakeLists.txt b/clicache/test2/CMakeLists.txt
index 8c8ff23..b45423c 100644
--- a/clicache/test2/CMakeLists.txt
+++ b/clicache/test2/CMakeLists.txt
@@ -36,6 +36,7 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 set_target_properties( ${PROJECT_NAME} PROPERTIES
+  COMMON_LANGUAGE_RUNTIME "" 
   VS_GLOBAL_ROOTNAMESPACE ${PROJECT_NAME}
   VS_GLOBAL_TreatWarningsAsErrors True
   VS_GLOBAL_TestProjectType UnitTest

Reply via email to