Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
pistache
Commits
3ffdffba
Unverified
Commit
3ffdffba
authored
Feb 19, 2019
by
Dennis Jenkins
Committed by
GitHub
Feb 19, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #460 from arthurafarias/arthurafarias-fix-missing-example-hello-server-build
Fixing examples build
parents
a28fc1bc
f714541f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
95 additions
and
4 deletions
+95
-4
.gitmodules
.gitmodules
+5
-0
CMakeLists.txt
CMakeLists.txt
+1
-0
CMakeModules/FindRapidJSON.cmake
CMakeModules/FindRapidJSON.cmake
+79
-0
examples/CMakeLists.txt
examples/CMakeLists.txt
+9
-4
third-party/rapidjson
third-party/rapidjson
+1
-0
No files found.
.gitmodules
View file @
3ffdffba
[submodule "third-party/rapidjson"]
path = third-party/rapidjson
url = https://github.com/Tencent/rapidjson
branch = v1.1.0
[submodule "third-party/googletest"]
path = third-party/googletest
url = https://github.com/google/googletest.git
...
...
CMakeLists.txt
View file @
3ffdffba
...
...
@@ -2,6 +2,7 @@ cmake_minimum_required (VERSION 3.1.3)
project
(
pistache
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -pedantic -Wextra -Wno-missing-field-initializers"
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
PROJECT_SOURCE_DIR
}
/CMakeModules
)
if
(
NOT CMAKE_BUILD_TYPE
)
set
(
CMAKE_BUILD_TYPE Release
)
...
...
CMakeModules/FindRapidJSON.cmake
0 → 100644
View file @
3ffdffba
#-------------------------------------------------------------------------------
# Copyright (c) 2013-2013, Lars Baehren <lbaehren@gmail.com>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification,
# are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#-------------------------------------------------------------------------------
# - Check for the presence of RAPIDJSON
#
# The following variables are set when RAPIDJSON is found:
# RAPIDJSON_FOUND = Set to true, if all components of RapidJSON have been
# found.
# RAPIDJSON_INCLUDES = Include path for the header files of RAPIDJSON
# RAPIDJSON_LIBRARIES = Link these to use RAPIDJSON
# RAPIDJSON_LFLAGS = Linker flags (optional)
if
(
NOT RAPIDJSON_FOUND
)
if
(
NOT RAPIDJSON_ROOT_DIR
)
set
(
RAPIDJSON_ROOT_DIR
${
CMAKE_INSTALL_PREFIX
}
)
endif
(
NOT RAPIDJSON_ROOT_DIR
)
##____________________________________________________________________________
## Check for the header files
find_path
(
RAPIDJSON_INCLUDES
NAMES rapidjson/rapidjson.h rapidjson/reader.h rapidjson/writer.h
HINTS
${
RAPIDJSON_ROOT_DIR
}
${
CMAKE_INSTALL_PREFIX
}
PATH_SUFFIXES include
)
##____________________________________________________________________________
## Actions taken when all components have been found
find_package_handle_standard_args
(
RAPIDJSON DEFAULT_MSG RAPIDJSON_INCLUDES
)
if
(
RAPIDJSON_FOUND
)
## Update
get_filename_component
(
RAPIDJSON_ROOT_DIR
${
RAPIDJSON_INCLUDES
}
PATH
)
## Feedback
if
(
NOT RAPIDJSON_FIND_QUIETLY
)
message
(
STATUS
"Found components for RapidJSON"
)
message
(
STATUS
"RAPIDJSON_ROOT_DIR =
${
RAPIDJSON_ROOT_DIR
}
"
)
message
(
STATUS
"RAPIDJSON_INCLUDES =
${
RAPIDJSON_INCLUDES
}
"
)
endif
(
NOT RAPIDJSON_FIND_QUIETLY
)
else
(
RAPIDJSON_FOUND
)
if
(
RAPIDJSON_FIND_REQUIRED
)
message
(
FATAL_ERROR
"Could not find RapidJSON!"
)
endif
(
RAPIDJSON_FIND_REQUIRED
)
endif
(
RAPIDJSON_FOUND
)
##____________________________________________________________________________
## Mark advanced variables
mark_as_advanced
(
RAPIDJSON_ROOT_DIR
RAPIDJSON_INCLUDES
)
endif
(
NOT RAPIDJSON_FOUND
)
\ No newline at end of file
examples/CMakeLists.txt
View file @
3ffdffba
...
...
@@ -6,13 +6,18 @@ function(pistache_example example_name)
target_link_libraries
(
${
EXAMPLE_EXECUTABLE
}
pistache_static
)
endfunction
()
pistache_example
(
hello_server
)
pistache_example
(
http_server
)
pistache_example
(
http_client
)
pistache_example
(
rest_server
)
pistache_example
(
custom_header
)
set
(
RAPIDJSON_ROOT_DIR PATH
"
${
PROJECT_SOURCE_DIR
}
/third-party/rapidjson"
)
find_package
(
RapidJSON
)
if
(
RapidJSON_FOUND
)
include_directories
(
${
RapidJSON_INCLUDE_DIRS
}
)
pistache_example
(
rest_description
)
endif
()
if
(
RAPIDJSON_FOUND
)
include_directories
(
${
RAPIDJSON_INCLUDES
}
)
pistache_example
(
rest_description
)
else
()
message
(
FATAL_ERROR
"RapidJSON not found. Could not build rest_description example."
)
endif
()
\ No newline at end of file
rapidjson
@
f54b0e47
Subproject commit f54b0e47a08782a6131cc3d60f94d038fa6e0a51
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment