summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/GenerateExportHeader/nodeprecated
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-01 19:38:46 (GMT)
committerBrad King <brad.king@kitware.com>2016-09-05 13:45:42 (GMT)
commit72ecdd34cf6dbec293fe020e1aeed0a17a499061 (patch)
tree6d9f59439c08feda95de1e24663e9805db8569d5 /Tests/RunCMake/GenerateExportHeader/nodeprecated
parentfc3dab0ea956db618fe2b77778ac413db846b422 (diff)
downloadCMake-72ecdd34cf6dbec293fe020e1aeed0a17a499061.zip
CMake-72ecdd34cf6dbec293fe020e1aeed0a17a499061.tar.gz
CMake-72ecdd34cf6dbec293fe020e1aeed0a17a499061.tar.bz2
Tests: Cleanup RunCMake.GenerateExportHeader somewhat
Diffstat (limited to 'Tests/RunCMake/GenerateExportHeader/nodeprecated')
-rw-r--r--Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt6
-rw-r--r--Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in2
-rw-r--r--Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp2
3 files changed, 3 insertions, 7 deletions
diff --git a/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt
index aeeb13a..7822d9c 100644
--- a/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt
@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(nodeprecated)
-
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/nodeprecated_defined)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/nodeprecated_not_defined)
@@ -23,4 +19,4 @@ try_compile(Result ${CMAKE_CURRENT_BINARY_DIR}/nodeprecated_defined_build
OUTPUT_VARIABLE Out
)
-test_fail(Result "Built even with no-deprecated define") \ No newline at end of file
+test_fail(Result "Built even with no-deprecated define")
diff --git a/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in b/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in
index d8dc482..90cfa12 100644
--- a/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in
+++ b/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.6)
project(nodeprecated_test)
diff --git a/Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp b/Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp
index eec46d3..f90d098 100644
--- a/Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp
+++ b/Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp
@@ -1,7 +1,7 @@
#include "someclass.h"
-int main(int, char**)
+int main()
{
SomeClass sc;
sc.someMethod();