Skip to content

Commit 1c10d6d

Browse files
authored
Update test environment and openssl version info. (#267)
1 parent 2d679c8 commit 1c10d6d

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ First create a build directory from the root of the project. In the build direct
6262

6363
For compiling with SSL support:
6464

65-
- You need to have the openssl installed in your development environment: (i) Add openssl include directory to include directories, (ii) Add openssl library directory to the link directories list (This is the directory named tls. e.g. cpp/Linux_64/hazelcast/lib/tls), (iii) Set the openssl libraries to link.
65+
- You need to have the openssl (version 1.0.2) installed in your development environment: (i) Add openssl `include` directory to include directories, (ii) Add openssl `library` directory to the link directories list (This is the directory named `tls`. e.g. `cpp/Linux_64/hazelcast/lib/tls`), (iii) Set the openssl libraries to link.
6666

6767
- You can provide your openssl installation directory to cmake using the following flags:
6868
- DHZ_OPENSSL_INCLUDE_DIR="Path to open installation include directory"
@@ -74,6 +74,12 @@ For compiling with SSL support:
7474
- For Mac OS and Linux, we link with "ssl" and "crypto"
7575
- For Windows there is an example linkage for 64 bit library and release build: "libeay32MD ssleay32MD libcrypto64MD libSSL64MD".
7676

77+
# Tested Platforms
78+
Our CI tests are run continuously on the following platforms and compilers:
79+
- Linux: CentOs5 gcc 3.4.6, CentOs5.11 gcc 4.1.2, centos 7 gcc 4.8.2
80+
- Windows: Visual Studio 12
81+
- Mac OS: Apple LLVM version 7.3.0 (clang-703.0.31)
82+
7783
## Mac
7884

7985
**Release:**
@@ -126,17 +132,17 @@ For compiling with SSL support:
126132

127133
cmake .. -DHZ_LIB_TYPE=STATIC -DHZ_BIT=32 -DCMAKE_BUILD_TYPE=Release
128134
cmake .. -DHZ_LIB_TYPE=SHARED -DHZ_BIT=32 -DCMAKE_BUILD_TYPE=Release
129-
cmake .. -G "Visual Studio 10 Win64" -DHZ_LIB_TYPE=STATIC -DHZ_BIT=64 -DCMAKE_BUILD_TYPE=Release
130-
cmake .. -G "Visual Studio 10 Win64" -DHZ_LIB_TYPE=SHARED -DHZ_BIT=64 -DCMAKE_BUILD_TYPE=Release
135+
cmake .. -G "Visual Studio 12 Win64" -DHZ_LIB_TYPE=STATIC -DHZ_BIT=64 -DCMAKE_BUILD_TYPE=Release
136+
cmake .. -G "Visual Studio 12 Win64" -DHZ_LIB_TYPE=SHARED -DHZ_BIT=64 -DCMAKE_BUILD_TYPE=Release
131137

132138
MSBuild.exe HazelcastClient.sln /property:Configuration=Release
133139

134140
**Debug:**
135141

136142
cmake .. -DHZ_LIB_TYPE=STATIC -DHZ_BIT=32 -DCMAKE_BUILD_TYPE=Debug
137143
cmake .. -DHZ_LIB_TYPE=SHARED -DHZ_BIT=32 -DCMAKE_BUILD_TYPE=Debug
138-
cmake .. -G "Visual Studio 10 Win64" -DHZ_LIB_TYPE=STATIC -DHZ_BIT=64 -DCMAKE_BUILD_TYPE=Debug
139-
cmake .. -G "Visual Studio 10 Win64" -DHZ_LIB_TYPE=SHARED -DHZ_BIT=64 -DCMAKE_BUILD_TYPE=Debug
144+
cmake .. -G "Visual Studio 12 Win64" -DHZ_LIB_TYPE=STATIC -DHZ_BIT=64 -DCMAKE_BUILD_TYPE=Debug
145+
cmake .. -G "Visual Studio 12 Win64" -DHZ_LIB_TYPE=SHARED -DHZ_BIT=64 -DCMAKE_BUILD_TYPE=Debug
140146

141147
MSBuild.exe HazelcastClient.sln /property:TreatWarningsAsErrors=true /property:Configuration=Debug
142148

@@ -177,6 +183,7 @@ Each of the folders above contains the following:
177183

178184
- hazelcast/
179185
- lib/ => Contains both shared and static library of hazelcast.
186+
- lib/tls => Contains the library with TLS (SSL) support enabled.
180187
- include/ => Contains headers of client.
181188

182189
- external/

0 commit comments

Comments
 (0)