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 955f96d3e855ea11df5bf73b1211d9c060d00917 (commit) via 8064044c94a7ed8e4b8a699a730ebab1aafd925b (commit) via f3de459cec78eac3a7081379b6ee9c6cde36bb60 (commit) from e6ddcbf941fdfeda04e1ce760c3ee52de6166568 (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=955f96d3e855ea11df5bf73b1211d9c060d00917 commit 955f96d3e855ea11df5bf73b1211d9c060d00917 Merge: e6ddcbf 8064044 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Jun 1 13:00:20 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Jun 1 13:00:20 2011 -0400 Merge topic 'fix-12034-fixup-bundle-with-non-dotapp-exe' into next 8064044 BundleUtilities: Print reason for not loading module.so f3de459 BundleUtilities: Run test on Windows if either MSVC or dumpbin was found. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8064044c94a7ed8e4b8a699a730ebab1aafd925b commit 8064044c94a7ed8e4b8a699a730ebab1aafd925b Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Jun 1 10:59:34 2011 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Wed Jun 1 10:59:34 2011 -0600 BundleUtilities: Print reason for not loading module.so diff --git a/Tests/BundleUtilities/testbundleutils.cpp b/Tests/BundleUtilities/testbundleutils.cpp index 87eaae3..77fe4b0 100644 --- a/Tests/BundleUtilities/testbundleutils.cpp +++ b/Tests/BundleUtilities/testbundleutils.cpp @@ -16,14 +16,18 @@ int main(int, char**) #if defined(WIN32) HANDLE lib = LoadLibraryA("module.dll"); + if(!lib) + { + printf("Failed to open module\n"); + } #else void* lib = dlopen("module.so", RTLD_LAZY); -#endif - if(!lib) { - printf("Failed to open module\n"); + printf("Failed to open module\n%s\n", dlerror()); } +#endif + return lib == 0 ? 1 : 0; } http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3de459cec78eac3a7081379b6ee9c6cde36bb60 commit f3de459cec78eac3a7081379b6ee9c6cde36bb60 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Jun 1 10:53:06 2011 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Wed Jun 1 10:53:06 2011 -0600 BundleUtilities: Run test on Windows if either MSVC or dumpbin was found. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d840b96..be0b3f9 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -195,7 +195,9 @@ IF(BUILD_TESTING) # run test for BundleUtilities on supported platforms/compilers - if(MSVC OR + find_program(DUMPBIN_EXECUTABLE NAMES dumpbin) + mark_as_advanced(DUMPBIN_EXECUTABLE) + if(MSVC OR DUMPBIN_EXECUTABLE OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Darwin") ADD_TEST(BundleUtilities ${CMAKE_CTEST_COMMAND} @@ -207,7 +209,7 @@ IF(BUILD_TESTING) --build-project BundleUtilities ) LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities") - endif(MSVC OR + endif(MSVC OR DUMPBIN_EXECUTABLE OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Darwin") ----------------------------------------------------------------------- Summary of changes: Tests/BundleUtilities/testbundleutils.cpp | 10 +++++++--- Tests/CMakeLists.txt | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits