Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
R
rapidjson
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
rapidjson
Commits
89ad34ce
Commit
89ad34ce
authored
May 11, 2015
by
Phyks
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix CMakeLists for include as a thirdparty in projects
parent
7eb117a2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
CMakeLists.txt
CMakeLists.txt
+3
-3
FindGTestSrc.cmake
CMakeModules/FindGTestSrc.cmake
+3
-2
No files found.
CMakeLists.txt
View file @
89ad34ce
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
SET
(
CMAKE_MODULE_PATH
${
CMAKE_SOURCE_DIR
}
/CMakeModules
)
SET
(
CMAKE_MODULE_PATH
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/CMakeModules
)
PROJECT
(
RapidJSON CXX
)
...
...
@@ -17,7 +17,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
option
(
RAPIDJSON_BUILD_DOC
"Build rapidjson documentation."
ON
)
option
(
RAPIDJSON_BUILD_EXAMPLES
"Build rapidjson examples."
ON
)
option
(
RAPIDJSON_BUILD_TESTS
"Build rapidjson perftests and unittests."
ON
)
option
(
RAPIDJSON_BUILD_THIRDPARTY_GTEST
option
(
RAPIDJSON_BUILD_THIRDPARTY_GTEST
"Use gtest installation in `thirdparty/gtest` by default if available"
OFF
)
option
(
RAPIDJSON_HAS_STDSTRING
""
OFF
)
...
...
@@ -45,7 +45,7 @@ ELSEIF(WIN32)
ENDIF
()
SET
(
CMAKE_INSTALL_DIR
"
${
_CMAKE_INSTALL_DIR
}
"
CACHE PATH
"The directory cmake fiels are installed in"
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
/include
)
include_directories
(
${
CMAKE_
CURRENT_
SOURCE_DIR
}
/include
)
if
(
RAPIDJSON_BUILD_DOC
)
add_subdirectory
(
doc
)
...
...
CMakeModules/FindGTestSrc.cmake
View file @
89ad34ce
SET
(
GTEST_SEARCH_PATH
SET
(
GTEST_SEARCH_PATH
"
${
GTEST_SOURCE_DIR
}
"
"
${
CMAKE_
SOURCE_DIR
}
/thirdparty/gtest"
)
"
${
CMAKE_
CURRENT_LIST_DIR
}
/..
/thirdparty/gtest"
)
IF
(
UNIX
)
IF
(
RAPIDJSON_BUILD_THIRDPARTY_GTEST
)
...
...
@@ -15,6 +15,7 @@ FIND_PATH(GTEST_SOURCE_DIR
NAMES CMakeLists.txt src/gtest_main.cc
PATHS
${
GTEST_SEARCH_PATH
}
)
# Debian installs gtest include directory in /usr/include, thus need to look
# for include directory separately from source directory.
FIND_PATH
(
GTEST_INCLUDE_DIR
...
...
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