Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
845b98f4
Commit
845b98f4
authored
Oct 05, 2016
by
Chuck Atkins
Committed by
Brad King
Oct 07, 2016
Browse files
Use find_package for JsonCpp and LibUV instead of include
parent
1dc252ec
Pipeline
#29750
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
845b98f4
...
...
@@ -10,6 +10,10 @@ if(POLICY CMP0053)
endif
()
project
(
CMake
)
# Make sure we can find internal find_package modules only used for
# building CMake and not for shipping externally
list
(
INSERT CMAKE_MODULE_PATH 0
${
CMake_SOURCE_DIR
}
/Source/Modules
)
if
(
CMAKE_BOOTSTRAP
)
# Running from bootstrap script. Set local variable and remove from cache.
set
(
CMAKE_BOOTSTRAP 1
)
...
...
@@ -441,7 +445,7 @@ macro (CMAKE_BUILD_UTILITIES)
# Build jsoncpp library.
if
(
CMAKE_USE_SYSTEM_JSONCPP
)
if
(
NOT CMAKE_VERSION VERSION_LESS 3.0
)
in
clude
(
${
CMake_SOURCE_DIR
}
/Source/Modules/Find
JsonCpp
.cmake
)
f
in
d_package
(
JsonCpp
)
else
()
message
(
FATAL_ERROR
"CMAKE_USE_SYSTEM_JSONCPP requires CMake >= 3.0"
)
endif
()
...
...
@@ -487,7 +491,7 @@ int main(void) { return 0; }
if
(
CMAKE_USE_LIBUV
)
if
(
CMAKE_USE_SYSTEM_LIBUV
)
if
(
NOT CMAKE_VERSION VERSION_LESS 3.0
)
in
clude
(
${
CMake_SOURCE_DIR
}
/Source/Modules/FindLibUV.cmake
)
f
in
d_package
(
LibUV
)
else
()
message
(
FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBUV requires CMake >= 3.0"
)
endif
()
...
...
Brad King
@brad.king
Mentioned in commit
5553e330
·
Oct 07, 2016
Mentioned in commit
5553e330
Mentioned in commit 5553e330dc2015ec5b9f8e6573d9b58928bcb9e3
Toggle commit list
Write
Preview
Supports
Markdown
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