Skip to content

Commit 319dd31

Browse files
ClovelBillyONeal
Clovel
and
BillyONeal
authored
CMake fixes + CMake search for OpenSSL (macOS) (#1383)
Signed-off-by: Clovis Durand <cd.clovel19@gmail.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
1 parent b07011d commit 319dd31

File tree

10 files changed

+106
-94
lines changed

10 files changed

+106
-94
lines changed

‎Build_iOS/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project(casablanca-ios NONE)
2-
cmake_minimum_required(VERSION 3.1)
2+
cmake_minimum_required(VERSION 3.9)
33

44
enable_testing()
55

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.9)
22
project(cpprestsdk-root NONE)
33
enable_testing()
44
add_subdirectory(Release)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Once you have the library, look at our [tutorial](https://github.com/Microsoft/c
3939

4040
To use from CMake:
4141
```cmake
42-
cmake_minimum_required(VERSION 3.7)
42+
cmake_minimum_required(VERSION 3.9)
4343
project(main)
4444
4545
find_package(cpprestsdk REQUIRED)

‎Release/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
2-
cmake_minimum_required(VERSION 3.1)
2+
cmake_minimum_required(VERSION 3.9)
33
if(POLICY CMP0042)
44
cmake_policy(SET CMP0042 NEW) # use MACOSX_RPATH
55
endif()

‎Release/cmake/cpprest_find_openssl.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ function(cpprest_find_openssl)
3434
if(APPLE)
3535
if(NOT DEFINED OPENSSL_ROOT_DIR)
3636
# Prefer a homebrew version of OpenSSL over the one in /usr/lib
37-
file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)
37+
file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl*/*)
3838
# Prefer the latest (make the latest one first)
3939
list(REVERSE OPENSSL_ROOT_DIR)
40+
list(GET OPENSSL_ROOT_DIR 0 OPENSSL_ROOT_DIR)
4041
endif()
4142
# This should prevent linking against the system provided 0.9.8y
43+
message(STATUS "OPENSSL_ROOT_DIR = ${OPENSSL_ROOT_DIR}")
4244
set(_OPENSSL_VERSION "")
4345
endif()
4446
if(UNIX)

‎Release/cmake/cpprestsdk-config-version.in.cmake‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set(PACKAGE_VERSION @CPPREST_VERSION_MAJOR@.@CPPREST_VERSION_MINOR@.@CPPREST_VERSION_REVISION@)
2+
3+
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
4+
set(PACKAGE_VERSION_COMPATIBLE FALSE)
5+
else(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
6+
set(PACKAGE_VERSION_COMPATIBLE TRUE)
7+
if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
8+
set(PACKAGE_VERSION_EXACT TRUE)
9+
endif(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
10+
endif(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)

‎Release/cmake/cpprestsdk-config.in.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(@CPPREST_USES_WINHTTPPAL@)
1515
find_dependency(WINHTTPPAL)
1616
endif()
1717

18-
if(@CPPREST_USES_BOOST@ AND OFF)
18+
if(@CPPREST_USES_BOOST@)
1919
if(UNIX)
2020
find_dependency(Boost COMPONENTS random system thread filesystem chrono atomic date_time regex)
2121
else()

‎Release/src/CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,9 @@ else()
236236
endif()
237237

238238
if(CPPREST_INSTALL_HEADERS)
239-
install(FILES ${HEADERS_CPPREST} DESTINATION include/cpprest)
240-
install(FILES ${HEADERS_PPLX} DESTINATION include/pplx)
241-
install(FILES ${HEADERS_DETAILS} DESTINATION include/cpprest/details)
239+
install(FILES ${HEADERS_CPPREST} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpprest)
240+
install(FILES ${HEADERS_PPLX} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pplx)
241+
install(FILES ${HEADERS_DETAILS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpprest/details)
242242
endif()
243243

244244
if(CPPREST_INSTALL)
@@ -281,9 +281,10 @@ if(CPPREST_INSTALL)
281281
)
282282

283283
configure_file(../cmake/cpprestsdk-config.in.cmake "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" @ONLY)
284+
configure_file(../cmake/cpprestsdk-config-version.in.cmake "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config-version.cmake" @ONLY)
284285

285286
install(
286-
FILES "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake"
287+
FILES "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config-version.cmake"
287288
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CPPREST_EXPORT_DIR}
288289
)
289290
install(

‎azure-devops/build-windows.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ jobs:
1313
steps:
1414
- script: git submodule update --init vcpkg
1515
displayName: Checkout vcpkg submodule
16-
- task: CacheBeta@0
17-
displayName: Cache vcpkg
18-
inputs:
19-
key: $(vcpkgResponseFile) | $(Build.SourcesDirectory)/.git/modules/vcpkg/HEAD | ${{ parameters.targetPlatform }} | ${{ parameters.image }}
20-
path: '$(vcpkgLocation)'
2116
- task: run-vcpkg@0
2217
displayName: 'Run vcpkg'
2318
inputs:

‎azure-pipelines.yml‎

Lines changed: 83 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -68,85 +68,89 @@ jobs:
6868
export NCPU=2
6969
../configure.sh --ndk /usr/local/lib/android/sdk/ndk-bundle
7070
displayName: 'Build for Android'
71-
# - job: MacOS_Homebrew
72-
# pool:
73-
# vmImage: 'macOS-latest'
74-
# steps:
75-
# - script: brew install boost openssl ninja
76-
# displayName: Brew install dependencies
77-
# - script: |
78-
# mkdir build.debug
79-
# mkdir build.release
80-
# mkdir build.release.static
81-
# displayName: Make Build Directories
82-
# - task: CMake@1
83-
# inputs:
84-
# workingDirectory: 'build.debug'
85-
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
86-
# - task: CMake@1
87-
# inputs:
88-
# workingDirectory: 'build.release'
89-
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
90-
# - task: CMake@1
91-
# inputs:
92-
# workingDirectory: 'build.release.static'
93-
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..'
94-
# - script: |
95-
# cd build.debug
96-
# ninja
97-
# displayName: 'Run ninja, debug'
98-
# - script: |
99-
# cd build.debug/Release/Binaries
100-
# ./test_runner *test.dylib
101-
# displayName: 'Run tests, debug'
102-
# - script: |
103-
# cd build.release
104-
# ninja
105-
# displayName: 'Run ninja, release'
106-
# - script: |
107-
# cd build.release/Release/Binaries
108-
# ./test_runner *test.dylib
109-
# displayName: 'Run tests, release'
110-
# - script: |
111-
# cd build.release.static
112-
# ninja
113-
# displayName: 'Run ninja, release static'
114-
# - job: MacOS_Vcpkg
115-
# pool:
116-
# vmImage: 'macOS-latest'
117-
# steps:
118-
# - script: |
119-
# ./vcpkg/bootstrap-vcpkg.sh
120-
# ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg
121-
# displayName: Vcpkg install dependencies
122-
# - script: |
123-
# mkdir build.debug
124-
# mkdir build.release
125-
# displayName: Make Build Directories
126-
# - task: CMake@1
127-
# inputs:
128-
# workingDirectory: 'build.debug'
129-
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
130-
# - task: CMake@1
131-
# inputs:
132-
# workingDirectory: 'build.release'
133-
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
134-
# - script: |
135-
# cd build.debug
136-
# ninja
137-
# displayName: 'Run ninja debug'
138-
# - script: |
139-
# cd build.debug/Release/Binaries
140-
# ./test_runner *test.dylib
141-
# displayName: 'Run Tests debug'
142-
# - script: |
143-
# cd build.release
144-
# ninja
145-
# displayName: 'Run ninja, release'
146-
# - script: |
147-
# cd build.release/Release/Binaries
148-
# ./test_runner *test.dylib
149-
# displayName: 'Run tests, release'
71+
- job: MacOS_Homebrew
72+
pool:
73+
vmImage: 'macOS-latest'
74+
steps:
75+
- script: brew install boost openssl ninja
76+
displayName: Brew install dependencies
77+
- script: git submodule update --init Release/libs/websocketpp
78+
displayName: Checkout websocketpp submodule
79+
- script: |
80+
mkdir build.debug
81+
mkdir build.release
82+
mkdir build.release.static
83+
displayName: Make Build Directories
84+
- task: CMake@1
85+
inputs:
86+
workingDirectory: 'build.debug'
87+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
88+
- task: CMake@1
89+
inputs:
90+
workingDirectory: 'build.release'
91+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
92+
- task: CMake@1
93+
inputs:
94+
workingDirectory: 'build.release.static'
95+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..'
96+
- script: |
97+
cd build.debug
98+
ninja
99+
displayName: 'Run ninja, debug'
100+
- script: |
101+
cd build.debug/Release/Binaries
102+
./test_runner *test.dylib
103+
displayName: 'Run tests, debug'
104+
- script: |
105+
cd build.release
106+
ninja
107+
displayName: 'Run ninja, release'
108+
- script: |
109+
cd build.release/Release/Binaries
110+
./test_runner *test.dylib
111+
displayName: 'Run tests, release'
112+
- script: |
113+
cd build.release.static
114+
ninja
115+
displayName: 'Run ninja, release static'
116+
- job: MacOS_Vcpkg
117+
pool:
118+
vmImage: 'macOS-latest'
119+
steps:
120+
- script: git submodule update --init vcpkg
121+
displayName: Checkout vcpkg submodule
122+
- script: |
123+
./vcpkg/bootstrap-vcpkg.sh
124+
./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg
125+
displayName: Vcpkg install dependencies
126+
- script: |
127+
mkdir build.debug
128+
mkdir build.release
129+
displayName: Make Build Directories
130+
- task: CMake@1
131+
inputs:
132+
workingDirectory: 'build.debug'
133+
cmakeArgs: '-G Ninja -DCMAKE_MAKE_PROGRAM=$(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.0-osx/ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
134+
- task: CMake@1
135+
inputs:
136+
workingDirectory: 'build.release'
137+
cmakeArgs: '-G Ninja -DCMAKE_MAKE_PROGRAM=$(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.0-osx/ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
138+
- script: |
139+
cd build.debug
140+
$(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.0-osx/ninja
141+
displayName: 'Run ninja debug'
142+
- script: |
143+
cd build.debug/Release/Binaries
144+
./test_runner *test.dylib
145+
displayName: 'Run Tests debug'
146+
- script: |
147+
cd build.release
148+
$(Build.SourcesDirectory)/vcpkg/downloads/tools/ninja-1.10.0-osx/ninja
149+
displayName: 'Run ninja, release'
150+
- script: |
151+
cd build.release/Release/Binaries
152+
./test_runner *test.dylib
153+
displayName: 'Run tests, release'
150154
# - job: MacOS_iOS
151155
# pool:
152156
# vmImage: 'macOS-latest'

0 commit comments

Comments
 (0)