aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Rocard <kevin.rocard@intel.com>2015-04-11 23:03:52 +0200
committerEric Laurent <elaurent@google.com>2015-04-24 13:39:14 -0700
commitef9cc769da415e23ce00f9af07783997929f5f8b (patch)
tree90a7d5c77bfcbc0a3dab37c7d3ac26a3ba88c88a
parent3067473d780e1651804c37f3475dce96e49a7e95 (diff)
downloadexternal_parameter-framework-ef9cc769da415e23ce00f9af07783997929f5f8b.zip
external_parameter-framework-ef9cc769da415e23ce00f9af07783997929f5f8b.tar.gz
external_parameter-framework-ef9cc769da415e23ce00f9af07783997929f5f8b.tar.bz2
Move ctest definitions in it's own CMakeList
Ctest related files and definitions were at the source root although we try to keep it simple. Move all ctest related files and definition in a ctest directory. Signed-off-by: Kevin Rocard <kevin.rocard@intel.com>
-rw-r--r--CMakeLists.txt13
-rw-r--r--ctest/CMakeLists.txt40
-rw-r--r--ctest/CTestCustom.cmake (renamed from CTestCustom.cmake)0
3 files changed, 42 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbff0d9..6bf533c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+include(ctest/CMakeLists.txt)
+
option(COVERAGE "Build with coverage support" OFF)
if(COVERAGE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
@@ -54,17 +56,6 @@ add_subdirectory(remote-processor)
add_subdirectory(remote-process)
-include(CTest)
-# Ctest requires its configuration to be placed at the build root
-configure_file(CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
-
-function(set_test_env TestName)
- set_property(TEST ${TestName} PROPERTY ENVIRONMENT
- PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:$ENV{PATH}
- LD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{LD_LIBRARY_PATH}
- PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python:$ENV{PYTHONPATH})
-endfunction()
-
add_subdirectory(test)
option(BASH_COMPLETION "Install bash completion configuration" ON)
diff --git a/ctest/CMakeLists.txt b/ctest/CMakeLists.txt
new file mode 100644
index 0000000..e9d6bb4
--- /dev/null
+++ b/ctest/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Copyright (c) 2014-2015, Intel Corporation
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# 2. 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.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# 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.
+
+include(CTest)
+
+# Ctest requires its configuration to be placed at the build root
+configure_file(${CMAKE_CURRENT_LIST_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR} COPYONLY)
+
+function(set_test_env TestName)
+ set_property(TEST ${TestName} PROPERTY ENVIRONMENT
+ PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:$ENV{PATH}
+ LD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{LD_LIBRARY_PATH}
+ PYTHONPATH=${CMAKE_BINARY_DIR}/bindings/python:$ENV{PYTHONPATH})
+endfunction()
+
diff --git a/CTestCustom.cmake b/ctest/CTestCustom.cmake
index c0381a4..c0381a4 100644
--- a/CTestCustom.cmake
+++ b/ctest/CTestCustom.cmake