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 66f5ca07b1dfe4d5480c45851fae546b0ab2ff38 (commit)
via fa4dc08a1a69d0766cb17b03f1e3154e2dd0c0e7 (commit)
via e40b79e79fc0beb0a71889817f21bf196a892b09 (commit)
via b68d3dc1b5a7b783b9624c6ae4a06e2a70e30b55 (commit)
from 5b4f982bf807069834ef37c377567f14f345c034 (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=66f5ca07b1dfe4d5480c45851fae546b0ab2ff38
commit 66f5ca07b1dfe4d5480c45851fae546b0ab2ff38
Merge: 5b4f982 fa4dc08
Author: David Cole <david.c...@kitware.com>
AuthorDate: Tue May 31 15:38:18 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 31 15:38:18 2011 -0400
Merge topic 'fix-12034-fixup-bundle-with-non-dotapp-exe' into next
fa4dc08 BundleUtilities: Fix issues with custom target DEPENDS in test
(#12034)
e40b79e BundleUtilities: Fix test when using xcode (#12034)
b68d3dc BundleUtilities: Fix regex to extract dependents from ldd (#12034)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa4dc08a1a69d0766cb17b03f1e3154e2dd0c0e7
commit fa4dc08a1a69d0766cb17b03f1e3154e2dd0c0e7
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue May 31 13:17:01 2011 -0600
Commit: David Cole <david.c...@kitware.com>
CommitDate: Tue May 31 15:33:39 2011 -0400
BundleUtilities: Fix issues with custom target DEPENDS in test (#12034)
diff --git a/Tests/BundleUtilities/CMakeLists.txt
b/Tests/BundleUtilities/CMakeLists.txt
index 2a649e4..be2b058 100644
--- a/Tests/BundleUtilities/CMakeLists.txt
+++ b/Tests/BundleUtilities/CMakeLists.txt
@@ -43,6 +43,7 @@ add_custom_target(testbundleutils1_test ALL
"-DINPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
"-DOUTPUTDIR=${TESTBUNDLEDIR}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/bundleutils.cmake"
+ DEPENDS testbundleutils1 module
)
add_dependencies(testbundleutils1_test testbundleutils1)
@@ -66,5 +67,6 @@ add_custom_target(testbundleutils2_test ALL
"-DINPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
"-DOUTPUTDIR=${TESTBUNDLEDIR}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/bundleutils.cmake"
+ DEPENDS testbundleutils1 module
)
add_dependencies(testbundleutils2_test testbundleutils2)
diff --git a/Tests/BundleUtilities/bundleutils.cmake
b/Tests/BundleUtilities/bundleutils.cmake
index 4df2f2d..46765e7 100644
--- a/Tests/BundleUtilities/bundleutils.cmake
+++ b/Tests/BundleUtilities/bundleutils.cmake
@@ -37,8 +37,9 @@ include(BundleUtilities)
fixup_bundle("${OUTPUT}" "${OUTPUT_MODULE}" "${INPUTDIR}")
# make sure we can run the app
-execute_process(COMMAND "${OUTPUT}" RESULT_VARIABLE result WORKING_DIRECTORY
"${EXE_DIR}")
+message("Executing ${OUTPUT} in ${EXE_DIR}")
+execute_process(COMMAND "${OUTPUT}" RESULT_VARIABLE result OUTPUT_VARIABLE out
ERROR_VARIABLE out WORKING_DIRECTORY "${EXE_DIR}")
if(NOT result STREQUAL "0")
- message(FATAL_ERROR " failed to execute test program")
+ message(FATAL_ERROR " failed to execute test program\n${out}")
endif(NOT result STREQUAL "0")
diff --git a/Tests/BundleUtilities/testbundleutils.cpp
b/Tests/BundleUtilities/testbundleutils.cpp
index 0b1828f..87eaae3 100644
--- a/Tests/BundleUtilities/testbundleutils.cpp
+++ b/Tests/BundleUtilities/testbundleutils.cpp
@@ -1,6 +1,7 @@
#include "framework.h"
#include "shared.h"
+#include "stdio.h"
#if defined(WIN32)
#include <windows.h>
@@ -19,5 +20,10 @@ int main(int, char**)
void* lib = dlopen("module.so", RTLD_LAZY);
#endif
+ if(!lib)
+ {
+ printf("Failed to open module\n");
+ }
+
return lib == 0 ? 1 : 0;
}
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1c4a732..75ee7d9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -205,7 +205,6 @@ IF(BUILD_TESTING)
--build-generator ${CMAKE_TEST_GENERATOR}
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-project BundleUtilities
- --test-command testdir2/testbundleutils2
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
endif(CMAKE_SYSTEM_NAME MATCHES "Windows" OR
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e40b79e79fc0beb0a71889817f21bf196a892b09
commit e40b79e79fc0beb0a71889817f21bf196a892b09
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Fri May 27 17:06:35 2011 -0600
Commit: David Cole <david.c...@kitware.com>
CommitDate: Tue May 31 13:12:58 2011 -0400
BundleUtilities: Fix test when using xcode (#12034)
diff --git a/Tests/BundleUtilities/bundleutils.cmake
b/Tests/BundleUtilities/bundleutils.cmake
index 4a42a3a..4df2f2d 100644
--- a/Tests/BundleUtilities/bundleutils.cmake
+++ b/Tests/BundleUtilities/bundleutils.cmake
@@ -37,7 +37,7 @@ include(BundleUtilities)
fixup_bundle("${OUTPUT}" "${OUTPUT_MODULE}" "${INPUTDIR}")
# make sure we can run the app
-execute_process(COMMAND "${OUTPUT}" RESULT_VARIABLE result)
+execute_process(COMMAND "${OUTPUT}" RESULT_VARIABLE result WORKING_DIRECTORY
"${EXE_DIR}")
if(NOT result STREQUAL "0")
message(FATAL_ERROR " failed to execute test program")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b68d3dc1b5a7b783b9624c6ae4a06e2a70e30b55
commit b68d3dc1b5a7b783b9624c6ae4a06e2a70e30b55
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Fri May 27 16:48:22 2011 -0600
Commit: David Cole <david.c...@kitware.com>
CommitDate: Tue May 31 13:12:28 2011 -0400
BundleUtilities: Fix regex to extract dependents from ldd (#12034)
This regex works with spaces in the path.
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index f5c1b74..023b8b5 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -548,7 +548,7 @@ function(get_prerequisites target prerequisites_var
exclude_system recurse exepa
if("${gp_tool}" STREQUAL "ldd")
set(gp_cmd_args "")
- set(gp_regex "^[\t ]*[^\t ]+ => ([^\t ]+).*${eol_char}$")
+ set(gp_regex "^[\t ]*[^\t ]+ => ([^\t\(]+) .*${eol_char}$")
set(gp_regex_error "not found${eol_char}$")
set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$")
set(gp_regex_cmp_count 1)
-----------------------------------------------------------------------
Summary of changes:
Modules/GetPrerequisites.cmake | 2 +-
Tests/BundleUtilities/CMakeLists.txt | 2 ++
Tests/BundleUtilities/bundleutils.cmake | 5 +++--
Tests/BundleUtilities/testbundleutils.cpp | 6 ++++++
Tests/CMakeLists.txt | 1 -
5 files changed, 12 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
