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 3ad0dfff40aefe84216190fefb66d9e7b0374343 (commit)
via ab2161aa0a0f79cee7a10abbe2b57cf28e9165d8 (commit)
from 5370ef2e63ae5af94ca7727d3a597f23f579c928 (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=3ad0dfff40aefe84216190fefb66d9e7b0374343
commit 3ad0dfff40aefe84216190fefb66d9e7b0374343
Merge: 5370ef2 ab2161a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Oct 25 16:42:19 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 25 16:42:19 2011 -0400
Merge topic 'revert-target_link_libraries' into next
ab2161a Normalize next with the new test-target_link_libraries branch.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab2161aa0a0f79cee7a10abbe2b57cf28e9165d8
commit ab2161aa0a0f79cee7a10abbe2b57cf28e9165d8
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Oct 25 22:39:15 2011 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Oct 25 22:39:15 2011 +0200
Normalize next with the new test-target_link_libraries branch.
This should allow merging the new version of the branch into next.
Do not merge this branch into master.
diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 3f61ebc..fdd53eb 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -184,7 +184,7 @@ endmacro()
macro(EXPECT_FAIL)
_do_build(${ARGN})
if (${Result})
- message(SEND_ERROR "Failed! \n\n${Out} -- ${COUNT}")
+ message(SEND_ERROR "Failed! \n\n${Out}")
endif()
endmacro()
diff --git a/Tests/CMakeCommands/target_link_libraries/libs/CMakeLists.txt
b/Tests/CMakeCommands/target_link_libraries/libs/CMakeLists.txt
index e32d2cb..8bac943 100644
--- a/Tests/CMakeCommands/target_link_libraries/libs/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/libs/CMakeLists.txt
@@ -5,13 +5,6 @@ project(libs)
include(CheckCXXCompilerFlag)
include(GenerateExportHeader)
-check_cxx_compiler_flag(-Wl,--no-undefined HAS_NO_UNDEFINED)
-
-if (HAS_NO_UNDEFINED AND NOT APPLE)
- # Disabled while figuring out why the check above gives a false positive.
-# set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
-endif()
-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_VERBOSE_MAKEFILE ON)
diff --git a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
index 7b56727..77f5006 100644
--- a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
+++ b/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
@@ -57,32 +57,6 @@ else()
message("Unhandled Platform")
endif()
-
-check_cxx_compiler_flag(-Wl,--no-undefined HAS_NO_UNDEFINED)
-
-message("HAS_NO_UNDEFINED: ${HAS_NO_UNDEFINED}\n\nCOMPILE OUTPUT:\n${OUTPUT}")
-
-try_compile(HAS_NO_UNDEFINED_SHARED_LIB
- "${CMAKE_CURRENT_BINARY_DIR}/shared_lib_build"
- "${CMAKE_CURRENT_SOURCE_DIR}/shared_lib"
- shared_lib
- OUTPUT_VARIABLE Out
-)
-message("HAS_NO_UNDEFINED_SHARED_LIB: ${HAS_NO_UNDEFINED_SHARED_LIB}\n"
- "\nCOMPILE OUTPUT:\n${Out}"
-)
-
-try_compile(HAS_NO_UNDEFINED_STATIC_LIB
- "${CMAKE_CURRENT_BINARY_DIR}/static_lib_build"
- "${CMAKE_CURRENT_SOURCE_DIR}/static_lib"
- static_lib
- OUTPUT_VARIABLE Out
-)
-message("HAS_NO_UNDEFINED_STATIC_LIB: ${HAS_NO_UNDEFINED_STATIC_LIB}\n"
- "\nCOMPILE OUTPUT:\n${Out}"
-)
-
-
#
# This is a no-op executable... If this test is going to fail, it fails during
# the configure step while cmake is configuring this CMakeLists.txt file...
diff --git a/Tests/Module/CheckCXXCompilerFlag/shared_lib/CMakeLists.txt
b/Tests/Module/CheckCXXCompilerFlag/shared_lib/CMakeLists.txt
deleted file mode 100644
index 8c7190a..0000000
--- a/Tests/Module/CheckCXXCompilerFlag/shared_lib/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(shared_lib)
-
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/input.cpp"
- "int doNothing() { return 0; }\n"
-)
-
-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
-add_library(lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/input.cpp")
diff --git a/Tests/Module/CheckCXXCompilerFlag/static_lib/CMakeLists.txt
b/Tests/Module/CheckCXXCompilerFlag/static_lib/CMakeLists.txt
deleted file mode 100644
index 36c208d..0000000
--- a/Tests/Module/CheckCXXCompilerFlag/static_lib/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(static_lib)
-
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/input.cpp"
- "int doNothing() { return 0; }\n"
-)
-
-set(CMAKE_STATIC_LINKER_FLAGS "-Wl,--no-undefined")
-
-add_library(lib "${CMAKE_CURRENT_BINARY_DIR}/input.cpp")
-----------------------------------------------------------------------
Summary of changes:
.../target_link_libraries/CMakeLists.txt | 2 +-
.../target_link_libraries/libs/CMakeLists.txt | 7 -----
Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt | 26 --------------------
.../CheckCXXCompilerFlag/shared_lib/CMakeLists.txt | 12 ---------
.../CheckCXXCompilerFlag/static_lib/CMakeLists.txt | 13 ----------
5 files changed, 1 insertions(+), 59 deletions(-)
delete mode 100644 Tests/Module/CheckCXXCompilerFlag/shared_lib/CMakeLists.txt
delete mode 100644 Tests/Module/CheckCXXCompilerFlag/static_lib/CMakeLists.txt
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
