[Cmake-commits] CMake branch, next, updated. v3.6.1-1727-gb567cbc
Brad King
brad.king at kitware.com
Fri Sep 2 11:37:51 EDT 2016
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, next has been updated
via b567cbc8f72240d87354a016a046796cd7c68cef (commit)
via 5d7a57d5c193c6b3395b5897d62331f922b2aea5 (commit)
via 99cd51f2873a67511dbe7be81b73845c42d13ad9 (commit)
from 2d3a0bc9bf0ffe388bfb93c6e696c46140f55bcd (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=b567cbc8f72240d87354a016a046796cd7c68cef
commit b567cbc8f72240d87354a016a046796cd7c68cef
Merge: 2d3a0bc 5d7a57d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 2 11:37:48 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 2 11:37:48 2016 -0400
Merge topic 'test-GenerateExportHeader-with-RunCMake' into next
5d7a57d5 Tests: Cleanup RunCMake.GenerateExportHeader somewhat
99cd51f2 Tests: Port GenerateExportHeader test to RunCMake infrastructure
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d7a57d5c193c6b3395b5897d62331f922b2aea5
commit 5d7a57d5c193c6b3395b5897d62331f922b2aea5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 15:38:46 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 2 10:20:46 2016 -0400
Tests: Cleanup RunCMake.GenerateExportHeader somewhat
diff --git a/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
index fb4d95e..dc92486 100644
--- a/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
@@ -1,3 +1,3 @@
-cmake_minimum_required(VERSION 2.8.5)
+cmake_minimum_required(VERSION 3.6)
project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt b/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt
deleted file mode 100644
index 8d98f9d..0000000
--- a/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/GenerateExportHeader/GEH.cmake b/Tests/RunCMake/GenerateExportHeader/GEH.cmake
index e2a2a3b..ee0871b 100644
--- a/Tests/RunCMake/GenerateExportHeader/GEH.cmake
+++ b/Tests/RunCMake/GenerateExportHeader/GEH.cmake
@@ -1,23 +1,8 @@
-cmake_minimum_required(VERSION 2.8.5 FATAL_ERROR)
-cmake_policy(SET CMP0054 NEW)
+# Test add_compiler_export_flags without deprecation warning.
+set(CMAKE_WARN_DEPRECATED OFF)
project(GenerateExportHeader)
-# Prevent timeout on Watcom by not running the tests.
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom)
- file(WRITE
- "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
- "int main() { return 0; }
- "
- )
-
- add_executable(
- GenerateExportHeader
- "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
- )
- return()
-endif()
-
include(CheckCXXCompilerFlag)
set( CMAKE_INCLUDE_CURRENT_DIR ON )
@@ -80,16 +65,16 @@ add_compiler_export_flags()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR})
-message("#### COMPILER_HAS_DEPRECATED: " ${COMPILER_HAS_DEPRECATED})
-message("#### COMPILER_HAS_HIDDEN_VISIBILITY: " ${COMPILER_HAS_HIDDEN_VISIBILITY})
-message("#### WIN32: " ${WIN32})
-message("#### HAS_WERROR_FLAG: " ${HAS_WERROR_FLAG})
+message(STATUS "COMPILER_HAS_DEPRECATED: " ${COMPILER_HAS_DEPRECATED})
+message(STATUS "COMPILER_HAS_HIDDEN_VISIBILITY: " ${COMPILER_HAS_HIDDEN_VISIBILITY})
+message(STATUS "WIN32: " ${WIN32})
+message(STATUS "HAS_WERROR_FLAG: " ${HAS_WERROR_FLAG})
set(link_libraries)
macro(macro_add_test_library name)
add_subdirectory(${name})
include_directories(${name}
- ${${name}_BINARY_DIR} # For the export header.
+ ${CMAKE_CURRENT_BINARY_DIR}/${name} # For the export header.
)
list(APPEND link_libraries ${name})
endmacro()
@@ -132,7 +117,7 @@ elseif(COMPILER_HAS_DEPRECATED)
else()
set(_platform Empty)
endif()
-message("#### Testing reference: ${_platform}")
+message(STATUS "Testing reference: ${_platform}")
target_compile_definitions(GenerateExportHeader
PRIVATE
"SRC_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/reference/${_platform}\""
diff --git a/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
index 9f8c8ef..77c18e0 100644
--- a/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
@@ -1,5 +1,3 @@
-project(c_identifier)
-
set(c_identifier_lib_SRCS
c_identifier_class.cpp
)
diff --git a/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
index a057746..2828437 100644
--- a/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 2.8)
-
-project(lib_shared_and_static)
-
include(GenerateExportHeader)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
diff --git a/Tests/RunCMake/GenerateExportHeader/libshared/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/libshared/CMakeLists.txt
index e20adb1..c4a761c 100644
--- a/Tests/RunCMake/GenerateExportHeader/libshared/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/libshared/CMakeLists.txt
@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 2.8)
-
-project(libshared)
-
include(GenerateExportHeader)
add_compiler_export_flags()
diff --git a/Tests/RunCMake/GenerateExportHeader/libstatic/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/libstatic/CMakeLists.txt
index b2db3ea..0fd136c 100644
--- a/Tests/RunCMake/GenerateExportHeader/libstatic/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/libstatic/CMakeLists.txt
@@ -1,8 +1,3 @@
-
-cmake_minimum_required(VERSION 2.8)
-
-project(libstatic)
-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
include(GenerateExportHeader)
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")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99cd51f2873a67511dbe7be81b73845c42d13ad9
commit 99cd51f2873a67511dbe7be81b73845c42d13ad9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 15:22:05 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 2 10:20:46 2016 -0400
Tests: Port GenerateExportHeader test to RunCMake infrastructure
This will allow build failure cases to be added later.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d6c96e1..8293286 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -485,7 +485,6 @@ if(BUILD_TESTING)
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Module/ExternalData")
- ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
ADD_TEST_MACRO(Module.FindDependency FindDependency)
ADD_TEST_MACRO(Module.WriteCompilerDetectionHeader WriteCompilerDetectionHeader)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 323a36b..fa3d0f9 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -141,6 +141,9 @@ add_RunCMake_test(DisallowedCommands)
add_RunCMake_test(ExternalData)
add_RunCMake_test(FeatureSummary)
add_RunCMake_test(FPHSA)
+if(NOT CMAKE_C_COMPILER_ID MATCHES "Watcom")
+ add_RunCMake_test(GenerateExportHeader)
+endif()
add_RunCMake_test(GeneratorExpression)
add_RunCMake_test(GeneratorPlatform)
add_RunCMake_test(GeneratorToolset)
diff --git a/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
new file mode 100644
index 0000000..fb4d95e
--- /dev/null
+++ b/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.5)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt b/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt
new file mode 100644
index 0000000..8d98f9d
--- /dev/null
+++ b/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt
@@ -0,0 +1 @@
+.*
diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/GEH.cmake
similarity index 98%
rename from Tests/Module/GenerateExportHeader/CMakeLists.txt
rename to Tests/RunCMake/GenerateExportHeader/GEH.cmake
index 56f0f28..e2a2a3b 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/GEH.cmake
@@ -78,6 +78,7 @@ add_subdirectory(lib_shared_and_static)
add_compiler_export_flags()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR})
message("#### COMPILER_HAS_DEPRECATED: " ${COMPILER_HAS_DEPRECATED})
message("#### COMPILER_HAS_HIDDEN_VISIBILITY: " ${COMPILER_HAS_HIDDEN_VISIBILITY})
diff --git a/Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake b/Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake
new file mode 100644
index 0000000..e534c1f
--- /dev/null
+++ b/Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake
@@ -0,0 +1,17 @@
+include(RunCMake)
+
+function(run_GEH)
+ # Use a single build tree for a few tests without cleaning.
+ set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/GEH-build)
+ set(RunCMake_TEST_NO_CLEAN 1)
+ if(RunCMake_GENERATOR MATCHES "Make|Ninja")
+ set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
+ endif()
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+ run_cmake(GEH)
+ run_cmake_command(GEH-build ${CMAKE_COMMAND} --build . --config Debug)
+ run_cmake_command(GEH-run ${RunCMake_TEST_BINARY_DIR}/GenerateExportHeader)
+endfunction()
+
+run_GEH()
diff --git a/Tests/Module/GenerateExportHeader/c_identifier/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
similarity index 100%
rename from Tests/Module/GenerateExportHeader/c_identifier/CMakeLists.txt
rename to Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
diff --git a/Tests/Module/GenerateExportHeader/c_identifier/c_identifier_class.cpp b/Tests/RunCMake/GenerateExportHeader/c_identifier/c_identifier_class.cpp
similarity index 100%
rename from Tests/Module/GenerateExportHeader/c_identifier/c_identifier_class.cpp
rename to Tests/RunCMake/GenerateExportHeader/c_identifier/c_identifier_class.cpp
diff --git a/Tests/Module/GenerateExportHeader/c_identifier/c_identifier_class.h b/Tests/RunCMake/GenerateExportHeader/c_identifier/c_identifier_class.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/c_identifier/c_identifier_class.h
rename to Tests/RunCMake/GenerateExportHeader/c_identifier/c_identifier_class.h
diff --git a/Tests/Module/GenerateExportHeader/c_identifier/main.cpp b/Tests/RunCMake/GenerateExportHeader/c_identifier/main.cpp
similarity index 100%
rename from Tests/Module/GenerateExportHeader/c_identifier/main.cpp
rename to Tests/RunCMake/GenerateExportHeader/c_identifier/main.cpp
diff --git a/Tests/Module/GenerateExportHeader/exportheader_test.cpp b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
similarity index 100%
rename from Tests/Module/GenerateExportHeader/exportheader_test.cpp
rename to Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
similarity index 100%
rename from Tests/Module/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
rename to Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt
diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp
similarity index 100%
rename from Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp
rename to Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp
diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
rename to Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
diff --git a/Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/libshared/CMakeLists.txt
similarity index 100%
rename from Tests/Module/GenerateExportHeader/libshared/CMakeLists.txt
rename to Tests/RunCMake/GenerateExportHeader/libshared/CMakeLists.txt
diff --git a/Tests/Module/GenerateExportHeader/libshared/libshared.cpp b/Tests/RunCMake/GenerateExportHeader/libshared/libshared.cpp
similarity index 100%
rename from Tests/Module/GenerateExportHeader/libshared/libshared.cpp
rename to Tests/RunCMake/GenerateExportHeader/libshared/libshared.cpp
diff --git a/Tests/Module/GenerateExportHeader/libshared/libshared.h b/Tests/RunCMake/GenerateExportHeader/libshared/libshared.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/libshared/libshared.h
rename to Tests/RunCMake/GenerateExportHeader/libshared/libshared.h
diff --git a/Tests/Module/GenerateExportHeader/libstatic/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/libstatic/CMakeLists.txt
similarity index 100%
rename from Tests/Module/GenerateExportHeader/libstatic/CMakeLists.txt
rename to Tests/RunCMake/GenerateExportHeader/libstatic/CMakeLists.txt
diff --git a/Tests/Module/GenerateExportHeader/libstatic/libstatic.cpp b/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.cpp
similarity index 100%
rename from Tests/Module/GenerateExportHeader/libstatic/libstatic.cpp
rename to Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.cpp
diff --git a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h b/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/libstatic/libstatic.h
rename to Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
diff --git a/Tests/Module/GenerateExportHeader/nodeprecated/CMakeLists.txt b/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt
similarity index 100%
rename from Tests/Module/GenerateExportHeader/nodeprecated/CMakeLists.txt
rename to Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt
diff --git a/Tests/Module/GenerateExportHeader/nodeprecated/CMakeLists.txt.in b/Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in
similarity index 100%
rename from Tests/Module/GenerateExportHeader/nodeprecated/CMakeLists.txt.in
rename to Tests/RunCMake/GenerateExportHeader/nodeprecated/CMakeLists.txt.in
diff --git a/Tests/Module/GenerateExportHeader/nodeprecated/src/main.cpp b/Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp
similarity index 100%
rename from Tests/Module/GenerateExportHeader/nodeprecated/src/main.cpp
rename to Tests/RunCMake/GenerateExportHeader/nodeprecated/src/main.cpp
diff --git a/Tests/Module/GenerateExportHeader/nodeprecated/src/someclass.cpp b/Tests/RunCMake/GenerateExportHeader/nodeprecated/src/someclass.cpp
similarity index 100%
rename from Tests/Module/GenerateExportHeader/nodeprecated/src/someclass.cpp
rename to Tests/RunCMake/GenerateExportHeader/nodeprecated/src/someclass.cpp
diff --git a/Tests/Module/GenerateExportHeader/nodeprecated/src/someclass.h b/Tests/RunCMake/GenerateExportHeader/nodeprecated/src/someclass.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/nodeprecated/src/someclass.h
rename to Tests/RunCMake/GenerateExportHeader/nodeprecated/src/someclass.h
diff --git a/Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h b/Tests/RunCMake/GenerateExportHeader/reference/Empty/libshared_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/Empty/libshared_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h b/Tests/RunCMake/GenerateExportHeader/reference/Empty/libstatic_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/Empty/libstatic_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/MinGW/libshared_export.h b/Tests/RunCMake/GenerateExportHeader/reference/MinGW/libshared_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/MinGW/libshared_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/MinGW/libshared_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/MinGW/libstatic_export.h b/Tests/RunCMake/GenerateExportHeader/reference/MinGW/libstatic_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/MinGW/libstatic_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/MinGW/libstatic_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/UNIX/libshared_export.h b/Tests/RunCMake/GenerateExportHeader/reference/UNIX/libshared_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/UNIX/libshared_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/UNIX/libshared_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/UNIX/libstatic_export.h b/Tests/RunCMake/GenerateExportHeader/reference/UNIX/libstatic_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/UNIX/libstatic_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/UNIX/libstatic_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h b/Tests/RunCMake/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h b/Tests/RunCMake/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/Win32-Clang/libshared_export.h b/Tests/RunCMake/GenerateExportHeader/reference/Win32-Clang/libshared_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/Win32-Clang/libshared_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/Win32-Clang/libshared_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/Win32-Clang/libstatic_export.h b/Tests/RunCMake/GenerateExportHeader/reference/Win32-Clang/libstatic_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/Win32-Clang/libstatic_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/Win32-Clang/libstatic_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/Win32/libshared_export.h b/Tests/RunCMake/GenerateExportHeader/reference/Win32/libshared_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/Win32/libshared_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/Win32/libshared_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/Win32/libstatic_export.h b/Tests/RunCMake/GenerateExportHeader/reference/Win32/libstatic_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/Win32/libstatic_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/Win32/libstatic_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/WinEmpty/libshared_export.h b/Tests/RunCMake/GenerateExportHeader/reference/WinEmpty/libshared_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/WinEmpty/libshared_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/WinEmpty/libshared_export.h
diff --git a/Tests/Module/GenerateExportHeader/reference/WinEmpty/libstatic_export.h b/Tests/RunCMake/GenerateExportHeader/reference/WinEmpty/libstatic_export.h
similarity index 100%
rename from Tests/Module/GenerateExportHeader/reference/WinEmpty/libstatic_export.h
rename to Tests/RunCMake/GenerateExportHeader/reference/WinEmpty/libstatic_export.h
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 1 -
Tests/RunCMake/CMakeLists.txt | 3 ++
.../CMakeLists.txt | 0
.../GenerateExportHeader/GEH.cmake} | 32 ++++++--------------
.../GenerateExportHeader/RunCMakeTest.cmake | 17 +++++++++++
.../c_identifier/CMakeLists.txt | 2 --
.../c_identifier/c_identifier_class.cpp | 0
.../c_identifier/c_identifier_class.h | 0
.../GenerateExportHeader/c_identifier/main.cpp | 0
.../GenerateExportHeader/exportheader_test.cpp | 0
.../lib_shared_and_static/CMakeLists.txt | 5 ---
.../lib_shared_and_static/libshared_and_static.cpp | 0
.../lib_shared_and_static/libshared_and_static.h | 0
.../GenerateExportHeader/libshared/CMakeLists.txt | 5 ---
.../GenerateExportHeader/libshared/libshared.cpp | 0
.../GenerateExportHeader/libshared/libshared.h | 0
.../GenerateExportHeader/libstatic/CMakeLists.txt | 5 ---
.../GenerateExportHeader/libstatic/libstatic.cpp | 0
.../GenerateExportHeader/libstatic/libstatic.h | 0
.../nodeprecated/CMakeLists.txt | 6 +---
.../nodeprecated/CMakeLists.txt.in | 0
.../GenerateExportHeader/nodeprecated/src/main.cpp | 0
.../nodeprecated/src/someclass.cpp | 0
.../nodeprecated/src/someclass.h | 0
.../reference/Empty/libshared_export.h | 0
.../reference/Empty/libstatic_export.h | 0
.../reference/MinGW/libshared_export.h | 0
.../reference/MinGW/libstatic_export.h | 0
.../reference/UNIX/libshared_export.h | 0
.../reference/UNIX/libstatic_export.h | 0
.../UNIX_DeprecatedOnly/libshared_export.h | 0
.../UNIX_DeprecatedOnly/libstatic_export.h | 0
.../reference/Win32-Clang/libshared_export.h | 0
.../reference/Win32-Clang/libstatic_export.h | 0
.../reference/Win32/libshared_export.h | 0
.../reference/Win32/libstatic_export.h | 0
.../reference/WinEmpty/libshared_export.h | 0
.../reference/WinEmpty/libstatic_export.h | 0
38 files changed, 30 insertions(+), 46 deletions(-)
copy Tests/RunCMake/{Android => GenerateExportHeader}/CMakeLists.txt (100%)
rename Tests/{Module/GenerateExportHeader/CMakeLists.txt => RunCMake/GenerateExportHeader/GEH.cmake} (80%)
create mode 100644 Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake
rename Tests/{Module => RunCMake}/GenerateExportHeader/c_identifier/CMakeLists.txt (92%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/c_identifier/c_identifier_class.cpp (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/c_identifier/c_identifier_class.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/c_identifier/main.cpp (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/exportheader_test.cpp (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/lib_shared_and_static/CMakeLists.txt (93%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/libshared/CMakeLists.txt (79%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/libshared/libshared.cpp (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/libshared/libshared.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/libstatic/CMakeLists.txt (83%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/libstatic/libstatic.cpp (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/libstatic/libstatic.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/nodeprecated/CMakeLists.txt (89%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/nodeprecated/CMakeLists.txt.in (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/nodeprecated/src/main.cpp (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/nodeprecated/src/someclass.cpp (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/nodeprecated/src/someclass.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/Empty/libshared_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/Empty/libstatic_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/MinGW/libshared_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/MinGW/libstatic_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/UNIX/libshared_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/UNIX/libstatic_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/Win32-Clang/libshared_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/Win32-Clang/libstatic_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/Win32/libshared_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/Win32/libstatic_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/WinEmpty/libshared_export.h (100%)
rename Tests/{Module => RunCMake}/GenerateExportHeader/reference/WinEmpty/libstatic_export.h (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list