Skip to content

Commit b23a75e

Browse files
Build with CMake (#4)
1 parent 3c17ee4 commit b23a75e

22 files changed

+516
-98
lines changed

.azure/default-build.yml

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ parameters:
44
beforeBuild: []
55
afterBuild: []
66
timeoutInMinutes: 60
7+
cMakeRunArgs: ''
8+
configuration: 'Release'
9+
gtestFlags: '--gtest_output=xml:$(Build.ArtifactStagingDirectory)/testOut/'
710

811
jobs:
912
- job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
@@ -13,7 +16,7 @@ jobs:
1316
${{ if ne(parameters.poolVmImage, '') }}:
1417
vmImage: ${{ parameters.poolVmImage }}
1518
${{ if and(eq(parameters.poolVmImage, ''), eq(parameters.agentOs, 'macOS')) }}:
16-
vmImage: macOS-10.13
19+
vmImage: macOS-10.14
1720
${{ if and(eq(parameters.poolVmImage, ''), eq(parameters.agentOs, 'Linux')) }}:
1821
vmImage: ubuntu-16.04
1922
steps:
@@ -22,4 +25,34 @@ jobs:
2225

2326
- ${{ parameters.beforeBuild }}
2427

25-
- ${{ parameters.afterBuild }}
28+
- task: CMake@1
29+
inputs:
30+
cmakeArgs: .. ${{ parameters.cMakeRunArgs }} -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=${{ parameters.configuration }}
31+
workingDirectory: 'build.${{ parameters.configuration }}'
32+
displayName: Create build files
33+
- task: CMake@1
34+
inputs:
35+
cmakeArgs: --build . --config ${{ parameters.configuration }}
36+
workingDirectory: 'build.${{ parameters.configuration }}'
37+
displayName: Build client
38+
- ${{ if eq(parameters.agentOs, 'macOS') }}:
39+
- bash: "./run-tests.sh ./build.${{ parameters.configuration }}/bin/signalrclienttests ${{ parameters.gtestFlags }}"
40+
condition: eq( variables['Agent.OS'], 'Darwin' )
41+
displayName: Run tests
42+
- ${{ if eq(parameters.agentOs, 'Linux') }}:
43+
- bash: "./run-tests.sh ./build.${{ parameters.configuration }}/bin/signalrclienttests ${{ parameters.gtestFlags }}"
44+
condition: eq( variables['Agent.OS'], 'Linux' )
45+
displayName: Run tests
46+
- ${{ if eq(parameters.agentOs, 'Windows') }}:
47+
- powershell: "& ./build.${{ parameters.configuration }}/bin/${{ parameters.configuration }}/signalrclienttests.exe ${{ parameters.gtestFlags }}"
48+
condition: eq( variables['Agent.OS'], 'Windows_NT' )
49+
displayName: Run tests
50+
51+
- ${{ parameters.afterBuild }}
52+
53+
- task: PublishTestResults@2
54+
displayName: Publish test results
55+
condition: always()
56+
inputs:
57+
testRunner: junit
58+
testResultsFiles: '$(Build.ArtifactStagingDirectory)/testOut/**/*.xml'

CMakeLists.txt

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,50 @@
1-
cmake_minimum_required (VERSION 2.8.11)
1+
cmake_minimum_required (VERSION 3.5)
2+
3+
if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
4+
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
5+
endif()
6+
27
project (signalrclient)
38

4-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -L -lcpprest")
9+
include(CTest)
10+
11+
if(NOT WIN32)
12+
set(EXTRA_FLAGS "-std=c++11 -fPIC -DNO_SIGNALRCLIENT_EXPORTS")
13+
else()
14+
set(EXTRA_FLAGS "-DSIGNALRCLIENT_EXPORTS")
15+
endif()
16+
17+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS}")
18+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_LDFLAGS}")
519

6-
set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir")
20+
find_package(cpprestsdk REQUIRED)
21+
set(CPPREST_LIB "cpprestsdk::cpprest")
722

8-
include_directories (
9-
include
10-
"${CPPREST_INCLUDE_DIR}")
23+
include_directories (include)
1124

12-
find_library(CPPREST_SO NAMES "cpprest" PATHS ${CPPREST_LIB_DIR} REQUIRED)
25+
# TODO: We shouldn't use this, it makes the dll/lib export all symbols
26+
# We need this for testing, but we might just add all the files to the test project manually
27+
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
28+
29+
if(NOT WIN32)
30+
if(APPLE)
31+
file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)
32+
list(REVERSE OPENSSL_ROOT_DIR)
33+
endif()
34+
35+
find_package(OpenSSL 1.0.0 REQUIRED)
36+
find_package(Boost REQUIRED COMPONENTS system thread chrono)
37+
endif()
1338

1439
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
1540
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
1641
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
1742

1843
add_subdirectory(src/signalrclient)
19-
add_subdirectory(test)
44+
45+
if(BUILD_TESTING)
46+
enable_testing()
47+
add_subdirectory(test)
48+
endif()
49+
50+
install(DIRECTORY include/ DESTINATION include/)

LICENSE.txt

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

README.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,41 @@
33
This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at https://github.com/aspnet/AspNetCore.
44

55
Use https://github.com/aspnet/AspNetCore/issues for issues with this project.
6+
7+
### Build on Windows ###
8+
```powershell
9+
PS> git submodule update --init
10+
PS> .\submodules\vcpkg\bootstrap-vcpkg.bat
11+
PS> .\submodules\vcpkg\vcpkg.exe install cpprestsdk:x64-windows
12+
PS> mkdir build.release
13+
PS> cd build.release
14+
PS> cmake .. -A x64 -DCMAKE_TOOLCHAIN_FILE="..\submodules\vcpkg\scripts\buildsystems\vcpkg.cmake" -DCMAKE_BUILD_TYPE=Release
15+
PS> cmake --build . --config Release
16+
```
17+
Output will be in `build.release\bin\Release\`
18+
19+
### Build on Mac ###
20+
```bash
21+
$ git submodule update --init
22+
$ brew install gcc6
23+
$ ./submodules/vcpkg/bootstrap-vcpkg.sh
24+
$ ./submodules/vcpkg/vcpkg install cpprestsdk
25+
$ mkdir build.release
26+
$ cd build.release
27+
$ cmake .. -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release
28+
$ cmake --build . --config Release
29+
```
30+
Output will be in `build.release/bin/`
31+
32+
### Build on Linux ###
33+
34+
```bash
35+
$ git submodule update --init
36+
$ ./submodules/vcpkg/bootstrap-vcpkg.sh
37+
$ ./submodules/vcpkg/vcpkg install cpprestsdk boost-system boost-chrono boost-thread
38+
$ mkdir build.release
39+
$ cd build.release
40+
$ cmake .. -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release
41+
$ cmake --build . --config Release
42+
```
43+
Output will be in `build.release/bin/`

azure-pipelines.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,24 @@ jobs:
55
- template: .azure/default-build.yml
66
parameters:
77
agentOs: Windows
8+
cMakeRunArgs: '-A x64'
89
beforeBuild:
9-
- script: echo Hello, world!
10-
displayName: 'Run a one-line script'
10+
- powershell: "& vcpkg.exe install cpprestsdk:x64-windows --vcpkg-root ./submodules/vcpkg"
11+
displayName: vcpkg install dependencies
1112

1213
- template: .azure/default-build.yml
1314
parameters:
1415
agentOs: macOs
1516
beforeBuild:
16-
- script: echo Hello, world!
17-
displayName: 'Run a one-line script'
17+
- script: brew install gcc6
18+
- bash: "./submodules/vcpkg/bootstrap-vcpkg.sh"
19+
displayName: Bootstrap vcpkg
20+
- bash: "./submodules/vcpkg/vcpkg install cpprestsdk"
21+
displayName: vcpkg install dependencies
1822

1923
- template: .azure/default-build.yml
2024
parameters:
2125
agentOs: Linux
2226
beforeBuild:
23-
- script: echo Hello, world!
24-
displayName: 'Run a one-line script'
27+
- script: sudo vcpkg install cpprestsdk boost-system boost-chrono boost-thread --vcpkg-root ./submodules/vcpkg
28+
displayName: vcpkg install dependencies

0 commit comments

Comments
 (0)