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 4f8dde2da662cc3021cb202a274fe2018830c446 (commit)
via 41f962a2cb239616e75f5de12d8987609dc4cde6 (commit)
via e17135e882188145e04c2ff455fad01273fdb375 (commit)
from 9a0e659a03ea7b10a7937df676a70d5423e2a710 (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=4f8dde2da662cc3021cb202a274fe2018830c446
commit 4f8dde2da662cc3021cb202a274fe2018830c446
Merge: 9a0e659 41f962a
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Jun 2 11:10:44 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jun 2 11:10:44 2011 -0400
Merge topic 'fix-12034-fixup-bundle-with-non-dotapp-exe' into next
41f962a Revert "BundleUtilities: Run test on Windows if either MSVC or
dumpbin was found."
e17135e BundleUtilities: Add rpath to loadable modules in test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41f962a2cb239616e75f5de12d8987609dc4cde6
commit 41f962a2cb239616e75f5de12d8987609dc4cde6
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Jun 2 09:09:14 2011 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Thu Jun 2 09:09:14 2011 -0600
Revert "BundleUtilities: Run test on Windows if either MSVC or dumpbin was
found."
This reverts commit f3de459cec78eac3a7081379b6ee9c6cde36bb60.
There are some platforms without MSVC where this test doesn't work well.
We can look
into these later.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index be0b3f9..d840b96 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -195,9 +195,7 @@ IF(BUILD_TESTING)
# run test for BundleUtilities on supported platforms/compilers
- find_program(DUMPBIN_EXECUTABLE NAMES dumpbin)
- mark_as_advanced(DUMPBIN_EXECUTABLE)
- if(MSVC OR DUMPBIN_EXECUTABLE OR
+ if(MSVC OR
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "Darwin")
ADD_TEST(BundleUtilities ${CMAKE_CTEST_COMMAND}
@@ -209,7 +207,7 @@ IF(BUILD_TESTING)
--build-project BundleUtilities
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
- endif(MSVC OR DUMPBIN_EXECUTABLE OR
+ endif(MSVC OR
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "Darwin")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e17135e882188145e04c2ff455fad01273fdb375
commit e17135e882188145e04c2ff455fad01273fdb375
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Jun 2 09:08:49 2011 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Thu Jun 2 09:08:49 2011 -0600
BundleUtilities: Add rpath to loadable modules in test.
diff --git a/Tests/BundleUtilities/CMakeLists.txt
b/Tests/BundleUtilities/CMakeLists.txt
index be2b058..6209c8f 100644
--- a/Tests/BundleUtilities/CMakeLists.txt
+++ b/Tests/BundleUtilities/CMakeLists.txt
@@ -9,12 +9,6 @@ add_library(shared SHARED shared.cpp shared.h)
# another shared library
add_library(shared2 SHARED shared2.cpp shared2.h)
-# a loadable module (depends on shared2)
-# test app will load this at runtime
-add_library(module MODULE module.cpp module.h)
-set_target_properties(module PROPERTIES PREFIX "")
-get_target_property(module_loc module LOCATION)
-target_link_libraries(module shared2)
# a framework library
add_library(framework SHARED framework.cpp framework.h)
@@ -22,28 +16,37 @@ add_library(framework SHARED framework.cpp framework.h)
#set_target_properties(framework PROPERTIES FRAMEWORK 1)
# make sure rpaths are not helping BundleUtilities or the executables
-set_target_properties(shared shared2 module framework PROPERTIES
+set_target_properties(shared shared2 framework PROPERTIES
SKIP_BUILD_RPATH 1)
###### test a Bundle application using dependencies
-set(TESTBUNDLEDIR "${CMAKE_CURRENT_BINARY_DIR}/testdir1")
-add_executable(testbundleutils1 MACOSX_BUNDLE testbundleutils.cpp)
+# a loadable module (depends on shared2)
+# testbundleutils1 will load this at runtime
+add_library(module1 MODULE module.cpp module.h)
+set_target_properties(module1 PROPERTIES PREFIX "")
+get_target_property(module_loc module1 LOCATION)
+target_link_libraries(module1 shared2)
+
+# a bundle application
+add_executable(testbundleutils1 MACOSX_BUNDLE testbundleutils1.cpp)
target_link_libraries(testbundleutils1 shared framework ${CMAKE_DL_LIBS})
-set_target_properties(testbundleutils1 PROPERTIES
- INSTALL_RPATH "${TESTBUNDLEDIR}"
- BUILD_WITH_INSTALL_RPATH 1)
get_target_property(loc testbundleutils1 LOCATION)
+set_target_properties(testbundleutils1 module1 PROPERTIES
+ INSTALL_RPATH "${CMAKE_CURRENT_BINARY_DIR}/testdir1"
+ BUILD_WITH_INSTALL_RPATH 1)
+
+# add custom target to install and test the app
add_custom_target(testbundleutils1_test ALL
COMMAND ${CMAKE_COMMAND}
"-DINPUT=${loc}"
"-DMODULE=${module_loc}"
"-DINPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
- "-DOUTPUTDIR=${TESTBUNDLEDIR}"
+ "-DOUTPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/testdir1"
-P "${CMAKE_CURRENT_SOURCE_DIR}/bundleutils.cmake"
- DEPENDS testbundleutils1 module
+ DEPENDS testbundleutils1 module1
)
add_dependencies(testbundleutils1_test testbundleutils1)
@@ -52,21 +55,30 @@ add_dependencies(testbundleutils1_test testbundleutils1)
###### test a non-Bundle application using dependencies
-set(TESTBUNDLEDIR "${CMAKE_CURRENT_BINARY_DIR}/testdir2")
-add_executable(testbundleutils2 testbundleutils.cpp)
+# a loadable module (depends on shared2)
+# testbundleutils2 will load this at runtime
+add_library(module2 MODULE module.cpp module.h)
+set_target_properties(module2 PROPERTIES PREFIX "")
+get_target_property(module_loc module2 LOCATION)
+target_link_libraries(module2 shared2)
+
+# a non-bundle application
+add_executable(testbundleutils2 testbundleutils2.cpp)
target_link_libraries(testbundleutils2 shared framework ${CMAKE_DL_LIBS})
-set_target_properties(testbundleutils2 PROPERTIES
- INSTALL_RPATH "${TESTBUNDLEDIR}"
- BUILD_WITH_INSTALL_RPATH 1)
get_target_property(loc testbundleutils2 LOCATION)
+set_target_properties(testbundleutils2 module2 PROPERTIES
+ INSTALL_RPATH "${CMAKE_CURRENT_BINARY_DIR}/testdir2"
+ BUILD_WITH_INSTALL_RPATH 1)
+
+# add custom target to install and test the app
add_custom_target(testbundleutils2_test ALL
COMMAND ${CMAKE_COMMAND}
"-DINPUT=${loc}"
"-DMODULE=${module_loc}"
"-DINPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
- "-DOUTPUTDIR=${TESTBUNDLEDIR}"
+ "-DOUTPUTDIR=${CMAKE_CURRENT_BINARY_DIR}/testdir2"
-P "${CMAKE_CURRENT_SOURCE_DIR}/bundleutils.cmake"
- DEPENDS testbundleutils1 module
+ DEPENDS testbundleutils1 module2
)
add_dependencies(testbundleutils2_test testbundleutils2)
diff --git a/Tests/BundleUtilities/testbundleutils.cpp
b/Tests/BundleUtilities/testbundleutils1.cpp
similarity index 60%
copy from Tests/BundleUtilities/testbundleutils.cpp
copy to Tests/BundleUtilities/testbundleutils1.cpp
index 77fe4b0..23d3cbd 100644
--- a/Tests/BundleUtilities/testbundleutils.cpp
+++ b/Tests/BundleUtilities/testbundleutils1.cpp
@@ -15,16 +15,16 @@ int main(int, char**)
shared();
#if defined(WIN32)
- HANDLE lib = LoadLibraryA("module.dll");
+ HANDLE lib = LoadLibraryA("module1.dll");
if(!lib)
{
- printf("Failed to open module\n");
+ printf("Failed to open module1\n");
}
#else
- void* lib = dlopen("module.so", RTLD_LAZY);
+ void* lib = dlopen("module1.so", RTLD_LAZY);
if(!lib)
{
- printf("Failed to open module\n%s\n", dlerror());
+ printf("Failed to open module1\n%s\n", dlerror());
}
#endif
diff --git a/Tests/BundleUtilities/testbundleutils.cpp
b/Tests/BundleUtilities/testbundleutils2.cpp
similarity index 60%
rename from Tests/BundleUtilities/testbundleutils.cpp
rename to Tests/BundleUtilities/testbundleutils2.cpp
index 77fe4b0..319be89 100644
--- a/Tests/BundleUtilities/testbundleutils.cpp
+++ b/Tests/BundleUtilities/testbundleutils2.cpp
@@ -15,16 +15,16 @@ int main(int, char**)
shared();
#if defined(WIN32)
- HANDLE lib = LoadLibraryA("module.dll");
+ HANDLE lib = LoadLibraryA("module2.dll");
if(!lib)
{
- printf("Failed to open module\n");
+ printf("Failed to open module2\n");
}
#else
- void* lib = dlopen("module.so", RTLD_LAZY);
+ void* lib = dlopen("module2.so", RTLD_LAZY);
if(!lib)
{
- printf("Failed to open module\n%s\n", dlerror());
+ printf("Failed to open module2\n%s\n", dlerror());
}
#endif
-----------------------------------------------------------------------
Summary of changes:
Tests/BundleUtilities/CMakeLists.txt | 54 ++++++++++++--------
.../{testbundleutils.cpp => testbundleutils1.cpp} | 8 ++--
.../{testbundleutils.cpp => testbundleutils2.cpp} | 8 ++--
Tests/CMakeLists.txt | 6 +--
4 files changed, 43 insertions(+), 33 deletions(-)
copy Tests/BundleUtilities/{testbundleutils.cpp => testbundleutils1.cpp} (60%)
rename Tests/BundleUtilities/{testbundleutils.cpp => testbundleutils2.cpp}
(60%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
