[Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-267-g43edaee
Kitware Robot
kwrobot at kitware.com
Thu Nov 9 08:15:13 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 43edaee0ce663e4f1c2cfdfa4742450640a2f6e1 (commit)
via 05e9f6ec52a2cb87b529ee41059d809446a8e50d (commit)
from 1e9304bccb933956f8c8349f2dd89927dd0ec08b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43edaee0ce663e4f1c2cfdfa4742450640a2f6e1
commit 43edaee0ce663e4f1c2cfdfa4742450640a2f6e1
Merge: 1e9304b 05e9f6e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 9 13:12:59 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Nov 9 08:13:07 2017 -0500
Merge topic 'contract-plplot'
05e9f6ec Tests: Add contract test for PLplot
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1452
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05e9f6ec52a2cb87b529ee41059d809446a8e50d
commit 05e9f6ec52a2cb87b529ee41059d809446a8e50d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 6 10:21:54 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 8 06:47:26 2017 -0500
Tests: Add contract test for PLplot
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1c69805..b9558f1 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3396,6 +3396,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
# sets "CMake_TEST_CONTRACT_<project>_<var>" variables to configure
# the code below.
foreach(project
+ PLplot
Trilinos
VTK
)
diff --git a/Tests/Contracts/PLplot/CMakeLists.txt b/Tests/Contracts/PLplot/CMakeLists.txt
new file mode 100644
index 0000000..b87b4c3
--- /dev/null
+++ b/Tests/Contracts/PLplot/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.9)
+project(PLplotDriver NONE)
+include(ExternalProject)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../Home.cmake)
+set(PLplot_PREFIX "${HOME}/.cmake/Contracts/PLplot")
+file(REMOVE_RECURSE "${PLplot_PREFIX}")
+separate_arguments(PLplot_CMAKE_ARGS UNIX_COMMAND "${PLplot_CMAKE_FLAGS}")
+if(NOT PLplot_GIT_TAG)
+ set(PLplot_GIT_TAG "plplot-5.13.0")
+endif()
+ExternalProject_Add(PLplot
+ GIT_REPOSITORY "https://git.code.sf.net/p/plplot/plplot.git"
+ GIT_TAG "${PLplot_GIT_TAG}"
+ PREFIX "${PLplot_PREFIX}"
+ CMAKE_ARGS
+ -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+ ${PLplot_CMAKE_ARGS}
+ )
diff --git a/Tests/Contracts/PLplot/Configure.cmake b/Tests/Contracts/PLplot/Configure.cmake
new file mode 100644
index 0000000..83591d4
--- /dev/null
+++ b/Tests/Contracts/PLplot/Configure.cmake
@@ -0,0 +1,4 @@
+set(Contracts.PLplot_BUILD_OPTIONS
+ -DPLplot_CMAKE_FLAGS=${CMake_TEST_CONTRACT_PLplot_CMAKE_FLAGS}
+ -DPLplot_GIT_TAG=${CMake_TEST_CONTRACT_PLplot_GIT_TAG}
+ )
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 1 +
Tests/Contracts/PLplot/CMakeLists.txt | 18 ++++++++++++++++++
Tests/Contracts/PLplot/Configure.cmake | 4 ++++
3 files changed, 23 insertions(+)
create mode 100644 Tests/Contracts/PLplot/CMakeLists.txt
create mode 100644 Tests/Contracts/PLplot/Configure.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list