[Cmake-commits] CMake branch, next, updated. v2.8.7-1996-g472088d
Brad King
brad.king at kitware.com
Mon Jan 9 09:44:03 EST 2012
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 472088d86ad36b88a56184cd966964cc5cfb4533 (commit)
via 6632e3f40f76219dcd4fe7eb6da9b59a353b42e2 (commit)
from de6c1121a952475ae8f7e81150fa0f67ef0246b6 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=472088d86ad36b88a56184cd966964cc5cfb4533
commit 472088d86ad36b88a56184cd966964cc5cfb4533
Merge: de6c112 6632e3f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 09:44:02 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 09:44:02 2012 -0500
Merge topic 'test-target_link_libraries' into next
6632e3f Revert topic 'test-target_link_libraries'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6632e3f40f76219dcd4fe7eb6da9b59a353b42e2
commit 6632e3f40f76219dcd4fe7eb6da9b59a353b42e2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 09:32:43 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 09:42:21 2012 -0500
Revert topic 'test-target_link_libraries'
Revert commits
e3b6c57e Fail softly instead of fatally.
42e749c5 Add some unit tests for the target_link_libraries command
because the test cases are not reliable. Some platforms do transitive
linking of shared libraries whether their dependencies are listed on the
command line or not. See comment section "Notes about dependent
(transitive) shared libraries" in "Source/cmComputeLinkInformation.cxx".
Furthermore, the "fail softly" commit means that both known and unknown
problems with transitive linking behavior will not be reported anyway.
Further investigation into a suitable way to perform these tests will be
required before they can be added.
diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 6df1b4c..1faa888 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -56,272 +56,3 @@ assert_property(targetA LINK_INTERFACE_LIBRARIES "")
target_link_libraries(targetA depB depC)
assert_property(targetA LINK_INTERFACE_LIBRARIES "")
-
-try_compile(LINK_INTERFACE_LIBRARIES_FAILS
- "${CMAKE_CURRENT_BINARY_DIR}/control_point"
- "${CMAKE_CURRENT_SOURCE_DIR}/control_point"
- control_point
-)
-
-if (LINK_INTERFACE_LIBRARIES_FAILS)
- message("\n\n#######################\nTHIS PLATFORM DOES NOT SUPPORT LINK_INTERFACE_LIBRARIES\n\n")
- return()
-endif()
-
-set(Bools True False)
-
-foreach(B1 ${Bools})
- foreach(B2 ${Bools})
- execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory
- "${CMAKE_CURRENT_SOURCE_DIR}/libs"
- "${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}"
- )
- endforeach()
-endforeach()
-
-foreach(B1 ${Bools})
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libs_True_${B1}/CMakeLists.txt"
- "set(CMAKE_LINK_INTERFACE_LIBRARIES \"\")\n"
- )
-endforeach()
-
-foreach(B1 ${Bools})
- foreach(B2 ${Bools})
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}/CMakeLists.txt"
-
- "add_library(libA SHARED classA.cpp)\n"
- "add_library(libB SHARED classB.cpp)\n"
- "add_library(libC SHARED classC.cpp)\n"
-
- "generate_export_header(libA)\n"
- "generate_export_header(libB)\n"
- "generate_export_header(libC)\n"
-
- "target_link_libraries(libB libA)\n"
- "target_link_libraries(libC libA libB)\n"
- )
- endforeach()
-endforeach()
-
-foreach(B1 ${Bools})
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_True/CMakeLists.txt"
- "target_link_libraries(libB LINK_INTERFACE_LIBRARIES libA)\n"
- "target_link_libraries(libC LINK_INTERFACE_LIBRARIES libA)\n"
- )
-endforeach()
-
-foreach(B1 ${Bools})
- foreach(B2 ${Bools})
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}/CMakeLists.txt"
- "export(TARGETS libA libB libC FILE Targets.cmake)\n"
- )
-
- try_compile(Result "${CMAKE_CURRENT_BINARY_DIR}/libs_build_${B1}_${B2}"
- "${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}"
- libs
- OUTPUT_VARIABLE Out
- )
- if (NOT Result)
- message("Libs CLEAR_LINK_INTERFACE_LIBRARIES: ${B1}\n"
- "Libs SPECIFY_LINK_INTERFACE_LIBRARIES: ${B2}\n\n\n${Out}")
- message("\n\n#######################\nTHIS PLATFORM DOES NOT SUPPORT LINK_INTERFACE_LIBRARIES\n\n")
- return()
- endif()
- endforeach()
-endforeach()
-
-
-set (COUNT 0)
-macro(_do_build CLEAR_LINK_INTERFACE_LIBRARIES
- SPECIFY_LINK_INTERFACE_LIBRARIES)
- math(EXPR COUNT "${COUNT} + 1" )
-
- execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory
- "${CMAKE_CURRENT_SOURCE_DIR}/src"
- "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}"
- )
-
- # Set local short variables to avoid long lines
- set(B1 ${CLEAR_LINK_INTERFACE_LIBRARIES})
- set(B2 ${SPECIFY_LINK_INTERFACE_LIBRARIES})
- set(Libs_Build_Dir "${CMAKE_CURRENT_BINARY_DIR}/libs_build_${B1}_${B2}")
-
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/CMakeLists.txt"
- "include_directories(\"${CMAKE_CURRENT_BINARY_DIR}/libs_${B1}_${B2}\"\n"
- " \"${Libs_Build_Dir}\"\n"
- ")\n"
- "include(\"${Libs_Build_Dir}/Targets.cmake\")\n"
- )
-
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/main.cpp"
- ""
- )
-
- foreach(klass ${ARGN})
- if (klass STREQUAL "LIBS")
- break()
- endif()
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/main.cpp"
- "#include \"${klass}.h\"\n"
- )
- endforeach()
-
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/main.cpp"
- "int main(int, char **) {"
- )
-
- foreach(klass ${ARGN})
- if (klass STREQUAL "LIBS")
- break()
- endif()
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/main.cpp"
- "${klass} ${klass}_;\n"
- )
- endforeach()
-
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/main.cpp"
- "return 0;"
- "}\n"
- )
-
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/CMakeLists.txt"
-
- "add_executable(exec \n"
- "\"${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/main.cpp\")\n"
- )
-
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/CMakeLists.txt"
- "target_link_libraries(exec "
- )
-
- set(continue True)
- foreach(klass ${ARGN})
- if (klass STREQUAL "LIBS")
- # CMake has no continue() command
- set(continue False)
- endif()
- if (NOT continue AND NOT klass STREQUAL "LIBS")
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/CMakeLists.txt"
- "${klass} "
- )
- endif()
- endforeach()
-
- file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}/CMakeLists.txt"
- ")\n"
- )
-
- try_compile(Result "${CMAKE_CURRENT_BINARY_DIR}/fail${COUNT}"
- "${CMAKE_CURRENT_BINARY_DIR}/test${COUNT}"
- src
- OUTPUT_VARIABLE Out
- )
-endmacro()
-
-macro(EXPECT_PASS)
- _do_build(${ARGN})
- if (NOT ${Result})
- message(SEND_ERROR "Failed! \n\n${Out}")
- endif()
-endmacro()
-
-macro(EXPECT_FAIL)
- _do_build(${ARGN})
- if (${Result})
- message(SEND_ERROR "Failed! \n\n${Out}")
- endif()
-endmacro()
-
-macro(all_pass)
- expect_pass(False False ${ARGN})
- expect_pass(True False ${ARGN})
- expect_pass(False True ${ARGN})
- expect_pass(True True ${ARGN})
-endmacro()
-
-# If we specify all libs to the executable, it will always pass
-all_pass(
- classA
- LIBS
- libA
-)
-
-all_pass(
- classA classB
- LIBS
- libA libB
-)
-
-all_pass(
- classA classC
- LIBS
- libA libC
-)
-
-all_pass(
- classA classB classC
- LIBS
- libA libB libC
-)
-
-# If we don't set the CMAKE_LINK_INTERFACE_LIBRARIES to empty and
-# we don't explicitly specify the LINK_INTERFACE_LIBRARIES, the
-# executable can use all classes if linked
-# indirectly to them
-expect_pass(False False
- classA classB
- LIBS
- libB
-)
-
-# Although libC is linked to libA, libA is not part of the link interface of
-# libC.
-# Because we don't clear the CMAKE_LINK_INTERFACE_LIBRARIES it still works.
-expect_pass(False False
- classA classC
- LIBS
- libC
-)
-
-# However, if we do clear it and don't explicitly link the executable to it,
-# it fails,
-# whether we specify the link_interface_libraries properly or not.
-if (NOT APPLE)
- expect_fail(True False
- classB classC
- LIBS
- libC
- )
- expect_fail(True True
- classB classC
- LIBS
- libC
- )
-endif()
-
-
-# Then we can still link the executable to libA directly of course to pass
-expect_pass(True False
- classA classC
- LIBS
- libC libA
-)
-expect_pass(True True
- classA classC
- LIBS
- libC libA
-)
-
-# Also, if we clear and specify the link interface, we can use classes defined
-# in that interface without linking to the library directly
-expect_pass(True True
- classA classB
- LIBS
- libB
-)
-
-expect_pass(True True
- classA classC
- LIBS
- libC
-)
diff --git a/Tests/CMakeCommands/target_link_libraries/control_point/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/control_point/CMakeLists.txt
deleted file mode 100644
index e41c3f1..0000000
--- a/Tests/CMakeCommands/target_link_libraries/control_point/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(src)
-
-include(CheckCXXCompilerFlag)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_subdirectory(lib)
-
-include_directories(
- "${CMAKE_CURRENT_SOURCE_DIR}/lib"
- "${CMAKE_CURRENT_BINARY_DIR}/lib"
-)
-
-
-add_executable(exec
- "main.cpp"
-)
-
-target_link_libraries(exec libB )
diff --git a/Tests/CMakeCommands/target_link_libraries/control_point/lib/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/control_point/lib/CMakeLists.txt
deleted file mode 100644
index c0d1353..0000000
--- a/Tests/CMakeCommands/target_link_libraries/control_point/lib/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(libs)
-
-include(CheckCXXCompilerFlag)
-include(GenerateExportHeader)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_library(libA SHARED classA.cpp)
-add_library(libB SHARED classB.cpp)
-
-generate_export_header(libA)
-generate_export_header(libB)
-
-target_link_libraries(libB libA)
-
-target_link_libraries(libA LINK_INTERFACE_LIBRARIES "")
-target_link_libraries(libB LINK_INTERFACE_LIBRARIES "")
diff --git a/Tests/CMakeCommands/target_link_libraries/control_point/lib/classA.cpp b/Tests/CMakeCommands/target_link_libraries/control_point/lib/classA.cpp
deleted file mode 100644
index f5e7106..0000000
--- a/Tests/CMakeCommands/target_link_libraries/control_point/lib/classA.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "classA.h"
-
-classA::classA()
-{
-
-}
diff --git a/Tests/CMakeCommands/target_link_libraries/control_point/lib/classA.h b/Tests/CMakeCommands/target_link_libraries/control_point/lib/classA.h
deleted file mode 100644
index 4d568e3..0000000
--- a/Tests/CMakeCommands/target_link_libraries/control_point/lib/classA.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifndef CLASS_A_H
-#define CLASS_A_H
-
-#include "liba_export.h"
-
-class LIBA_EXPORT classA
-{
-public:
- classA();
-};
-
-#endif
diff --git a/Tests/CMakeCommands/target_link_libraries/control_point/lib/classB.cpp b/Tests/CMakeCommands/target_link_libraries/control_point/lib/classB.cpp
deleted file mode 100644
index e309586..0000000
--- a/Tests/CMakeCommands/target_link_libraries/control_point/lib/classB.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#include "classB.h"
-
-#include "classA.h"
-
-classB::classB()
-{
-}
-
-classA* classB::a() const
-{
- return new classA();
-}
diff --git a/Tests/CMakeCommands/target_link_libraries/control_point/lib/classB.h b/Tests/CMakeCommands/target_link_libraries/control_point/lib/classB.h
deleted file mode 100644
index e0baed6..0000000
--- a/Tests/CMakeCommands/target_link_libraries/control_point/lib/classB.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#ifndef CLASS_B_H
-#define CLASS_B_H
-
-#include "libb_export.h"
-
-class classA;
-
-class LIBB_EXPORT classB
-{
-public:
- classB();
-
- classA* a() const;
-};
-
-#endif
diff --git a/Tests/CMakeCommands/target_link_libraries/control_point/main.cpp b/Tests/CMakeCommands/target_link_libraries/control_point/main.cpp
deleted file mode 100644
index e5472cf..0000000
--- a/Tests/CMakeCommands/target_link_libraries/control_point/main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "classB.h"
-#include "classA.h"
-
-int main(int, char **) {
-
- classB classB_;
- classA classA_;
-
- return 0;
-}
diff --git a/Tests/CMakeCommands/target_link_libraries/libs/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/libs/CMakeLists.txt
deleted file mode 100644
index 8bac943..0000000
--- a/Tests/CMakeCommands/target_link_libraries/libs/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(libs)
-
-include(CheckCXXCompilerFlag)
-include(GenerateExportHeader)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
diff --git a/Tests/CMakeCommands/target_link_libraries/libs/classA.cpp b/Tests/CMakeCommands/target_link_libraries/libs/classA.cpp
deleted file mode 100644
index f5e7106..0000000
--- a/Tests/CMakeCommands/target_link_libraries/libs/classA.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "classA.h"
-
-classA::classA()
-{
-
-}
diff --git a/Tests/CMakeCommands/target_link_libraries/libs/classA.h b/Tests/CMakeCommands/target_link_libraries/libs/classA.h
deleted file mode 100644
index 4d568e3..0000000
--- a/Tests/CMakeCommands/target_link_libraries/libs/classA.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifndef CLASS_A_H
-#define CLASS_A_H
-
-#include "liba_export.h"
-
-class LIBA_EXPORT classA
-{
-public:
- classA();
-};
-
-#endif
diff --git a/Tests/CMakeCommands/target_link_libraries/libs/classB.cpp b/Tests/CMakeCommands/target_link_libraries/libs/classB.cpp
deleted file mode 100644
index e309586..0000000
--- a/Tests/CMakeCommands/target_link_libraries/libs/classB.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#include "classB.h"
-
-#include "classA.h"
-
-classB::classB()
-{
-}
-
-classA* classB::a() const
-{
- return new classA();
-}
diff --git a/Tests/CMakeCommands/target_link_libraries/libs/classB.h b/Tests/CMakeCommands/target_link_libraries/libs/classB.h
deleted file mode 100644
index e0baed6..0000000
--- a/Tests/CMakeCommands/target_link_libraries/libs/classB.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#ifndef CLASS_B_H
-#define CLASS_B_H
-
-#include "libb_export.h"
-
-class classA;
-
-class LIBB_EXPORT classB
-{
-public:
- classB();
-
- classA* a() const;
-};
-
-#endif
diff --git a/Tests/CMakeCommands/target_link_libraries/libs/classC.cpp b/Tests/CMakeCommands/target_link_libraries/libs/classC.cpp
deleted file mode 100644
index 6d15259..0000000
--- a/Tests/CMakeCommands/target_link_libraries/libs/classC.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#include "classC.h"
-
-#include "classA.h"
-#include "classB.h"
-
-classC::classC()
-{
- classB b;
-}
-
-classA* classC::a() const
-{
- return new classA();
-}
diff --git a/Tests/CMakeCommands/target_link_libraries/libs/classC.h b/Tests/CMakeCommands/target_link_libraries/libs/classC.h
deleted file mode 100644
index 0135f65..0000000
--- a/Tests/CMakeCommands/target_link_libraries/libs/classC.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#ifndef CLASS_C_H
-#define CLASS_C_H
-
-#include "libc_export.h"
-
-class classA;
-
-class LIBC_EXPORT classC
-{
-public:
- classC();
-
- classA* a() const;
-};
-
-#endif
diff --git a/Tests/CMakeCommands/target_link_libraries/src/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/src/CMakeLists.txt
deleted file mode 100644
index 29f0986..0000000
--- a/Tests/CMakeCommands/target_link_libraries/src/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(src)
-
-include(CheckCXXCompilerFlag)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-----------------------------------------------------------------------
Summary of changes:
.../target_link_libraries/CMakeLists.txt | 269 --------------------
.../control_point/CMakeLists.txt | 24 --
.../control_point/lib/CMakeLists.txt | 22 --
.../control_point/lib/classA.cpp | 7 -
.../control_point/lib/classA.h | 13 -
.../control_point/lib/classB.cpp | 13 -
.../control_point/lib/classB.h | 17 --
.../target_link_libraries/control_point/main.cpp | 10 -
.../target_link_libraries/libs/CMakeLists.txt | 11 -
.../target_link_libraries/libs/classA.cpp | 7 -
.../target_link_libraries/libs/classA.h | 13 -
.../target_link_libraries/libs/classB.cpp | 13 -
.../target_link_libraries/libs/classB.h | 17 --
.../target_link_libraries/libs/classC.cpp | 15 -
.../target_link_libraries/libs/classC.h | 17 --
.../target_link_libraries/src/CMakeLists.txt | 10 -
16 files changed, 0 insertions(+), 478 deletions(-)
delete mode 100644 Tests/CMakeCommands/target_link_libraries/control_point/CMakeLists.txt
delete mode 100644 Tests/CMakeCommands/target_link_libraries/control_point/lib/CMakeLists.txt
delete mode 100644 Tests/CMakeCommands/target_link_libraries/control_point/lib/classA.cpp
delete mode 100644 Tests/CMakeCommands/target_link_libraries/control_point/lib/classA.h
delete mode 100644 Tests/CMakeCommands/target_link_libraries/control_point/lib/classB.cpp
delete mode 100644 Tests/CMakeCommands/target_link_libraries/control_point/lib/classB.h
delete mode 100644 Tests/CMakeCommands/target_link_libraries/control_point/main.cpp
delete mode 100644 Tests/CMakeCommands/target_link_libraries/libs/CMakeLists.txt
delete mode 100644 Tests/CMakeCommands/target_link_libraries/libs/classA.cpp
delete mode 100644 Tests/CMakeCommands/target_link_libraries/libs/classA.h
delete mode 100644 Tests/CMakeCommands/target_link_libraries/libs/classB.cpp
delete mode 100644 Tests/CMakeCommands/target_link_libraries/libs/classB.h
delete mode 100644 Tests/CMakeCommands/target_link_libraries/libs/classC.cpp
delete mode 100644 Tests/CMakeCommands/target_link_libraries/libs/classC.h
delete mode 100644 Tests/CMakeCommands/target_link_libraries/src/CMakeLists.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list