[Cmake-commits] CMake branch, next, updated. v2.8.3-1078-g5035449
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 503544980c38bacdde19255b0597db8151d0c7c4 (commit)
via 753e2082851b67163dda4764e08c8ce9b84690fe (commit)
via 16e7d4ba2c82081afea5af05bc6360b281d5e0c3 (commit)
from 23f34ce710b820177bcb602557e34cef1655db8c (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=503544980c38bacdde19255b0597db8151d0c7c4
commit 503544980c38bacdde19255b0597db8151d0c7c4
Merge: 23f34ce 753e208
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Dec 22 15:47:29 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Dec 22 15:47:29 2010 -0500
Merge topic 'add_preprocessor_def_vs2010_resources' into next
753e208 Disable incremental testing for this test, it crashes vs9 linker.
16e7d4b Add flags to resource builds on vs 2010 with a test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=753e2082851b67163dda4764e08c8ce9b84690fe
commit 753e2082851b67163dda4764e08c8ce9b84690fe
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Dec 22 15:40:53 2010 -0500
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Wed Dec 22 15:40:53 2010 -0500
Disable incremental testing for this test, it crashes vs9 linker.
On windows 7 64 bit, the vs9 linker will crash when linking an
application with a resource in it.
diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt
index 8a71bd0..e842955 100644
--- a/Tests/VSResource/CMakeLists.txt
+++ b/Tests/VSResource/CMakeLists.txt
@@ -1,4 +1,7 @@
cmake_minimum_required (VERSION 2.6)
project (VSResource)
add_definitions(/DCMAKE_RCDEFINE=test.txt)
+string(REPLACE /INCREMENTAL:YES
+ CMAKE_EXE_LINKER_FLAGS_DEBUG
+ ${CMAKE_EXE_LINKER_FLAGS_DEBUG})
add_executable(VSResource main.cpp test.rc)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16e7d4ba2c82081afea5af05bc6360b281d5e0c3
commit 16e7d4ba2c82081afea5af05bc6360b281d5e0c3
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Dec 21 09:17:21 2010 -0500
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue Dec 21 09:20:57 2010 -0500
Add flags to resource builds on vs 2010 with a test.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index f78aeec..ebe36f2 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1139,10 +1139,13 @@ OutputIncludes(std::vectorstd::string const
includes)
void cmVisualStudio10TargetGenerator::
-WriteRCOptions(std::string const ,
+WriteRCOptions(std::string const configName,
std::vectorstd::string const includes)
{
this-WriteString(ResourceCompile\n, 2);
+ Options clOptions = *(this-ClOptions[configName]);
+ clOptions.OutputPreprocessorDefinitions(*this-BuildFileStream, ,
+ \n);
this-OutputIncludes(includes);
this-WriteString(/ResourceCompile\n, 2);
}
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 04f0774..f7d3c18 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -246,7 +246,6 @@ IF(BUILD_TESTING)
--test-command Simple)
LIST(APPEND TEST_BUILD_DIRS
${CMake_BINARY_DIR}/Tests/Simple_CodeBlocksGenerator)
ENDIF (${cmakeOutput} MATCHES CodeBlocks)
-
# check for the KDevelop3 generator
IF (${cmakeOutput} MATCHES KDevelop3)
ADD_TEST(Simple_KDevelop3Generator ${CMAKE_CTEST_COMMAND}
@@ -262,6 +261,17 @@ IF(BUILD_TESTING)
ENDIF (${cmakeOutput} MATCHES KDevelop3)
ENDIF(${CMAKE_TEST_GENERATOR} MATCHES Unix Makefiles OR
${CMAKE_TEST_GENERATOR} MATCHES KDevelop)
+ ADD_TEST(VSResource ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ ${CMake_SOURCE_DIR}/Tests/VSResource
+ ${CMake_BINARY_DIR}/Tests/VSResource
+ --build-two-config
+ --build-generator ${CMAKE_TEST_GENERATOR}
+ --build-project VSResource
+ --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+ --test-command VSResource)
+LIST(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/VSResource)
+
# test for correct sub-project generation
# not implemented in VS6 or Xcode
diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt
new file mode 100644
index 000..8a71bd0
--- /dev/null
+++ b/Tests/VSResource/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required (VERSION 2.6)
+project (VSResource)
+add_definitions(/DCMAKE_RCDEFINE=test.txt)
+add_executable(VSResource main.cpp test.rc)
diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp
new
[Cmake-commits] CMake branch, next, updated. v2.8.3-1080-g251c851
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 251c8514e29c80ac737060487b61f43394dee77c (commit)
via 8c7b19d35ee81afac57fe623217578191f4d034c (commit)
from 503544980c38bacdde19255b0597db8151d0c7c4 (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=251c8514e29c80ac737060487b61f43394dee77c
commit 251c8514e29c80ac737060487b61f43394dee77c
Merge: 5035449 8c7b19d
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Dec 22 16:15:14 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Dec 22 16:15:14 2010 -0500
Merge topic 'add_preprocessor_def_vs2010_resources' into next
8c7b19d Only run resource test for MSVC compilers.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c7b19d35ee81afac57fe623217578191f4d034c
commit 8c7b19d35ee81afac57fe623217578191f4d034c
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Wed Dec 22 16:14:37 2010 -0500
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Wed Dec 22 16:14:37 2010 -0500
Only run resource test for MSVC compilers.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f7d3c18..8f29641 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -131,6 +131,9 @@ IF(BUILD_TESTING)
ADD_TEST_MACRO(TarTest TarTest)
ADD_TEST_MACRO(SystemInformation SystemInformation)
ADD_TEST_MACRO(MathTest MathTest)
+ IF(MSVC)
+ADD_TEST_MACRO(VSResource VSResource)
+ ENDIF()
ADD_TEST_MACRO(Simple Simple)
ADD_TEST_MACRO(PreOrder PreOrder)
ADD_TEST_MACRO(MissingSourceFile MissingSourceFile)
@@ -261,17 +264,6 @@ IF(BUILD_TESTING)
ENDIF (${cmakeOutput} MATCHES KDevelop3)
ENDIF(${CMAKE_TEST_GENERATOR} MATCHES Unix Makefiles OR
${CMAKE_TEST_GENERATOR} MATCHES KDevelop)
- ADD_TEST(VSResource ${CMAKE_CTEST_COMMAND}
- --build-and-test
- ${CMake_SOURCE_DIR}/Tests/VSResource
- ${CMake_BINARY_DIR}/Tests/VSResource
- --build-two-config
- --build-generator ${CMAKE_TEST_GENERATOR}
- --build-project VSResource
- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
- --test-command VSResource)
-LIST(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/VSResource)
-
# test for correct sub-project generation
# not implemented in VS6 or Xcode
---
Summary of changes:
Tests/CMakeLists.txt | 14 +++---
1 files changed, 3 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.3-1082-g3e8bacc
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 3e8bacc4b0aeb2c568b347b4109a8f8320d2ae7e (commit)
via e498527f1ded497ddaf2d3285ace224f2e013a40 (commit)
from 251c8514e29c80ac737060487b61f43394dee77c (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=3e8bacc4b0aeb2c568b347b4109a8f8320d2ae7e
commit 3e8bacc4b0aeb2c568b347b4109a8f8320d2ae7e
Merge: 251c851 e498527
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Dec 22 16:31:58 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Dec 22 16:31:58 2010 -0500
Merge topic 'mac-headerpad_max_install_names-passthru' into next
e498527 Pass Mac linker flag through all compilers with -Wl,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e498527f1ded497ddaf2d3285ace224f2e013a40
commit e498527f1ded497ddaf2d3285ace224f2e013a40
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Dec 22 16:28:54 2010 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Dec 22 16:28:54 2010 -0500
Pass Mac linker flag through all compilers with -Wl,
The Mac linker defines flag -headerpad_max_install_names but not all
front-ends recognize the flag and pass it through (many did in the past,
such as the Apple port of GCC). Use the -Wl, option prefix to tell
front-ends to pass it through without trying to interpret it.
diff --git a/Modules/Platform/Darwin-GNU.cmake
b/Modules/Platform/Darwin-GNU.cmake
index f425eb9..8a50a6a 100644
--- a/Modules/Platform/Darwin-GNU.cmake
+++ b/Modules/Platform/Darwin-GNU.cmake
@@ -20,8 +20,8 @@ set(__DARWIN_COMPILER_GNU 1)
macro(__darwin_compiler_gnu lang)
# GNU does not have -shared on OS X
- set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS -dynamiclib
-headerpad_max_install_names)
- set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS -bundle
-headerpad_max_install_names)
+ set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS -dynamiclib
-Wl,-headerpad_max_install_names)
+ set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS -bundle
-Wl,-headerpad_max_install_names)
endmacro()
macro(cmake_gnu_has_isysroot lang)
diff --git a/Modules/Platform/Darwin-icc.cmake
b/Modules/Platform/Darwin-icc.cmake
index 49aa843..b62036c 100644
--- a/Modules/Platform/Darwin-icc.cmake
+++ b/Modules/Platform/Darwin-icc.cmake
@@ -33,11 +33,11 @@ SET(CMAKE_SHARED_MODULE_PREFIX lib)
SET(CMAKE_SHARED_MODULE_SUFFIX .so)
SET(CMAKE_MODULE_EXISTS 1)
SET(CMAKE_DL_LIBS )
-SET(CMAKE_C_LINK_FLAGS -headerpad_max_install_names)
-SET(CMAKE_CXX_LINK_FLAGS -headerpad_max_install_names)
+SET(CMAKE_C_LINK_FLAGS -Wl,-headerpad_max_install_names)
+SET(CMAKE_CXX_LINK_FLAGS -Wl,-headerpad_max_install_names)
SET(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
-SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS -dynamiclib
-headerpad_max_install_names)
-SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS -bundle -headerpad_max_install_names)
+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS -dynamiclib
-Wl,-headerpad_max_install_names)
+SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS -bundle
-Wl,-headerpad_max_install_names)
SET(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
---
Summary of changes:
Modules/Platform/Darwin-GNU.cmake |4 ++--
Modules/Platform/Darwin-icc.cmake |8
2 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.3-333-g97e64e8
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, master has been updated via 97e64e8607dd1f761eaa945c1cc525093725f3fc (commit) from 104cd4acd8b104326e90267b20f91c9433e779b2 (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=97e64e8607dd1f761eaa945c1cc525093725f3fc commit 97e64e8607dd1f761eaa945c1cc525093725f3fc Author: KWSys Robot kwro...@kitware.com AuthorDate: Thu Dec 23 00:01:09 2010 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Thu Dec 23 00:10:37 2010 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 124dd40..c799cd9 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 12) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 22) +SET(KWSYS_DATE_STAMP_DAY 23) --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
