geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject geode-native git commit: GEODE-2766: Only apply patches on Solaris
Date Tue, 11 Apr 2017 15:25:15 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop 830599888 -> 876067051


GEODE-2766: Only apply patches on Solaris

- This avoids trying to apply patches on Windows which can break if the source
  wasn't actually checked out by a Windows git.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/87606705
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/87606705
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/87606705

Branch: refs/heads/develop
Commit: 876067051269375b2162a953d5dd572469eef1c3
Parents: 8305998
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Mon Apr 10 14:40:34 2017 -0700
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Mon Apr 10 14:40:34 2017 -0700

----------------------------------------------------------------------
 src/dependencies/ACE/CMakeLists.txt     | 2 ++
 src/dependencies/openssl/CMakeLists.txt | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/87606705/src/dependencies/ACE/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/ACE/CMakeLists.txt b/src/dependencies/ACE/CMakeLists.txt
index 9e752cc..d0218af 100644
--- a/src/dependencies/ACE/CMakeLists.txt
+++ b/src/dependencies/ACE/CMakeLists.txt
@@ -136,6 +136,7 @@ if (${WIN32})
   set(CMAKE_STATIC_LIBRARY_SUFFIX s$<${MSVC}:$<$<CONFIG:Debug>:d>>.lib)
 endif()
 
+if ($(CMAKE_HOST_SOLARIS))
 set( PATCH_FILE ${CMAKE_CURRENT_SOURCE_DIR}/patches )
 ExternalProject_Add_Step( ${${PROJECT_NAME}_EXTERN} patches
     ALWAYS 0
@@ -146,6 +147,7 @@ ExternalProject_Add_Step( ${${PROJECT_NAME}_EXTERN} patches
     WORKING_DIRECTORY ${${PROJECT_NAME}_SOURCE_DIR}
     COMMAND ${PATCH} -u -N -p1 < ${PATCH_FILE}
 )
+endif()
 
 configure_file(config.h.in config.h)
 ExternalProject_Add_Step( ${${PROJECT_NAME}_EXTERN} config.h

http://git-wip-us.apache.org/repos/asf/geode-native/blob/87606705/src/dependencies/openssl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/openssl/CMakeLists.txt b/src/dependencies/openssl/CMakeLists.txt
index a4db483..4d22715 100644
--- a/src/dependencies/openssl/CMakeLists.txt
+++ b/src/dependencies/openssl/CMakeLists.txt
@@ -100,6 +100,7 @@ else()
   set( CMAKE_LINK_LIBRARY_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
 endif()
 
+if ($(CMAKE_HOST_SOLARIS))
 ExternalProject_Add_Step( ${${PROJECT_NAME}_EXTERN} patches
     BYPRODUCTS ${${PROJECT_NAME}_SOURCE_DIR}/Configure
     ALWAYS 0
@@ -109,6 +110,7 @@ ExternalProject_Add_Step( ${${PROJECT_NAME}_EXTERN} patches
     WORKING_DIRECTORY ${${PROJECT_NAME}_SOURCE_DIR}
     COMMAND ${PATCH} -u -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patches
 )
+endif()
 
 add_library(ssl INTERFACE)
 target_include_directories(ssl INTERFACE


Mime
View raw message