[Cmake-commits] CMake branch, next, updated. v2.8.9-398-g6e88a1c
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 6e88a1c9130533f681764336c7219e094f66db25 (commit)
via c582e781b170fc81a77087d969c5e4f79a9d9ecb (commit)
via 0acba2b47703c028e19501a03f9f28f6974c6ef2 (commit)
via de9cba73368a78327cee7e626e4caa2bb2a437d6 (commit)
via 8b51762426ff6e3efbe61ee49f99755c24b4772c (commit)
via bc0e8c28ece1d681449b9b4b43b16fb5b331534e (commit)
via c2f47590ef4fb937a5baa4d4b9e0f364e812d407 (commit)
via 52a2477438097cbe6ae5385a5f8c26d05adbe376 (commit)
from 7ea28629f7c9bf5ff656f44a4c0b2f84e69b1372 (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=6e88a1c9130533f681764336c7219e094f66db25
commit 6e88a1c9130533f681764336c7219e094f66db25
Merge: 7ea2862 c582e78
Author: Bill Hoffman
AuthorDate: Fri Sep 7 16:45:07 2012 -0400
Commit: CMake Topic Stage
CommitDate: Fri Sep 7 16:45:07 2012 -0400
Merge topic 'file-download-verify' into next
c582e78 Change the nightly releases to build using ssl.
0acba2b file(DOWNLOAD): Add options for SSL
de9cba7 Merge branch 'curl-openssl' into file-download-verify
8b51762 curl: Honor OPENSSL_NO_SSL2
bc0e8c2 curl: Make OpenSSL DLLs available to CMake on Windows
c2f4759 curl: Use find_package(OpenSSL)
52a2477 file(DOWNLOAD): Generalize EXPECTED_MD5 to EXPECTED_HASH
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c582e781b170fc81a77087d969c5e4f79a9d9ecb
commit c582e781b170fc81a77087d969c5e4f79a9d9ecb
Author: Bill Hoffman
AuthorDate: Fri Sep 7 15:30:19 2012 -0400
Commit: Bill Hoffman
CommitDate: Fri Sep 7 15:30:19 2012 -0400
Change the nightly releases to build using ssl.
diff --git a/Utilities/Release/dash2win64_release.cmake
b/Utilities/Release/dash2win64_release.cmake
index fb82de0..6d1ac76 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -8,6 +8,7 @@ set(CPACK_SOURCE_GENERATORS "ZIP")
set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j8")
set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_USE_OPENSSL:BOOL=ON
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CMAKE_Fortran_COMPILER:FILEPATH=FALSE
CMAKE_GENERATOR:INTERNAL=Unix Makefiles
diff --git a/Utilities/Release/dashmacmini2_release.cmake
b/Utilities/Release/dashmacmini2_release.cmake
index 3e6b049..5e57a70 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -9,6 +9,10 @@ set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
set(INITIAL_CACHE "
CMAKE_BUILD_TYPE:STRING=Release
CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
+CMAKE_USE_OPENSSL:BOOL=ON
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1c-install/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1c-install/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1c-install/lib/libssl.a
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CPACK_SYSTEM_NAME:STRING=Darwin-universal
BUILD_QtDialog:BOOL=TRUE
diff --git a/Utilities/Release/dashmacmini5_release.cmake
b/Utilities/Release/dashmacmini5_release.cmake
index bd93a87..36b0952 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -8,6 +8,10 @@ set(MAKE "${MAKE_PROGRAM} -j5")
set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
set(CPACK_SOURCE_GENERATORS "TGZ TZ")
set(INITIAL_CACHE "
+CMAKE_USE_OPENSSL:BOOL=ON
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1c-install/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1c-install/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1c-install/lib/libssl.a
CMAKE_BUILD_TYPE:STRING=Release
CMAKE_OSX_ARCHITECTURES:STRING=x86_64;i386
CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5
diff --git a/Utilities/Release/magrathea_release.cmake
b/Utilities/Release/magrathea_release.cmake
index 60c1a88..4783fda 100644
--- a/Utilities/Release/magrathea_release.cmake
+++ b/Utilities/Release/magrathea_release.cmake
@@ -10,6 +10,10 @@ CMAKE_BUILD_TYPE:STRING=Release
CURSES_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libncurses.a
CURSES_INCLUDE_PATH:PATH=/usr/i686-gcc-332s/include/ncurses
FORM_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libform.a
+CMAKE_USE_OPENSSL:BOOL=ON
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.1c-install/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.1c-install/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.1c-install/lib/l
[Cmake-commits] CMake branch, next, updated. v2.8.9-505-g33a8c95
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 33a8c95f280f62e7e59db56815bf05acc71e338b (commit)
via c2664610845199f90f7f71664bfaf2d1c1a60ea9 (commit)
from e51caf753df9f4c2b08c58417247e9c4fe86cafe (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=33a8c95f280f62e7e59db56815bf05acc71e338b
commit 33a8c95f280f62e7e59db56815bf05acc71e338b
Merge: e51caf7 c266461
Author: Bill Hoffman
AuthorDate: Wed Sep 12 18:35:56 2012 -0400
Commit: CMake Topic Stage
CommitDate: Wed Sep 12 18:35:56 2012 -0400
Merge topic 'ExternalProject-check-hashes' into next
c266461 Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2664610845199f90f7f71664bfaf2d1c1a60ea9
commit c2664610845199f90f7f71664bfaf2d1c1a60ea9
Author: Bill Hoffman
AuthorDate: Wed Sep 12 18:31:52 2012 -0400
Commit: Bill Hoffman
CommitDate: Wed Sep 12 18:31:52 2012 -0400
Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add.
This commit adds the ability to turn on and off ssl certificate
authority checking. It also adds the ability to specify a
certificate authority information file. This can be done
by setting global cmake variables CMAKE_CURLOPT_CAINFO_FILE
and or CMAKE_CURLOPT_SSL_VERIFYPEER in the project calling
ExternalProject_Add, or by passing those options to individual
ExternalProject_Add calls.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index c61e8f7..d2e00a8 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -26,6 +26,8 @@
#[URL /.../src.tgz] # Full path or URL of source
#[URL_HASH ALGO=value] # Hash of file at URL
#[URL_MD5 md5] # Equivalent to URL_HASH MD5=md5
+#[SSL_VERIFYPEER bool] # Should certificate for https be checked
+#[CAINFO_FILE file] # Path to a certificate authority file
#[TIMEOUT seconds] # Time allowed for file download operations
# #--Update/Patch step--
#[UPDATE_COMMAND cmd...] # Source work-tree update command
@@ -399,7 +401,7 @@ endif()
endfunction()
-function(_ep_write_downloadfile_script script_filename remote local timeout
hash)
+function(_ep_write_downloadfile_script script_filename remote local timeout
hash ssl_verify cainfo_file)
if(timeout)
set(timeout_args TIMEOUT ${timeout})
set(timeout_msg "${timeout} seconds")
@@ -413,6 +415,27 @@ function(_ep_write_downloadfile_script script_filename
remote local timeout hash
else()
set(hash_args "# no EXPECTED_HASH")
endif()
+ # check for curl globals in the project
+ if(DEFINED CMAKE_CURLOPT_SSL_VERIFYPEER)
+set(ssl_verify "set(CMAKE_CURLOPT_SSL_VERIFYPEER
${CMAKE_CURLOPT_SSL_VERIFYPEER})")
+ endif()
+ if(DEFINED CMAKE_CURLOPT_CAINFO_FILE)
+set(ssl_cainfo "set(CMAKE_CURLOPT_CAINFO_FILE
\"${CMAKE_CURLOPT_CAINFO_FILE}\")")
+ endif()
+
+ # now check for curl locals so that the local values
+ # will override the globals
+
+ # check for ssl_verify argument
+ string(LENGTH "${ssl_verify}" ssl_verify_len)
+ if(ssl_verify_len GREATER 0)
+set(ssl_verify "set(CMAKE_CURLOPT_SSL_VERIFYPEER ${ssl_verify})")
+ endif()
+ # check for cainfo_file argument
+ string(LENGTH "${cainfo_file}" cainfo_file_len)
+ if(cainfo_file_len GREATER 0)
+set(ssl_cainfo "set(CMAKE_CURLOPT_CAINFO_FILE \"${cainfo_file}\")")
+ endif()
file(WRITE ${script_filename}
"message(STATUS \"downloading...
@@ -420,6 +443,9 @@ function(_ep_write_downloadfile_script script_filename
remote local timeout hash
dst='${local}'
timeout='${timeout_msg}'\")
+${ssl_verify}
+${ssl_cainfo}
+
file(DOWNLOAD
\"${remote}\"
\"${local}\"
@@ -1281,7 +1307,10 @@ function(_ep_add_download_command name)
string(REPLACE ";" "-" fname "${fname}")
set(file ${download_dir}/${fname})
get_property(timeout TARGET ${name} PROPERTY _EP_TIMEOUT)
-_ep_write_downloadfile_script("${stamp_dir}/download-${name}.cmake"
"${url}" "${file}" "${timeout}" "${hash}")
+get_property(ssl_verify TARGET ${name} PROPERTY _EP_SSL_VERIFYPEER)
+get_property(cainfo_file TARGET ${name} PROPERTY _EP_CAINFO_FILE)
+_ep_write_downloadfile_script("${stamp_dir}/d
[Cmake-commits] CMake branch, next, updated. v2.8.9-948-g0ffab33
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 0ffab33eef83c9c5e796d1625fc8a92e47055511 (commit)
via 2edc00b48bae600a2e763071735c1adfd4214d91 (commit)
from b3d91d564c7a7250a25f20b9fa8cb857c7d6f4b2 (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=0ffab33eef83c9c5e796d1625fc8a92e47055511
commit 0ffab33eef83c9c5e796d1625fc8a92e47055511
Merge: b3d91d5 2edc00b
Author: Bill Hoffman
AuthorDate: Mon Oct 1 17:01:01 2012 -0400
Commit: CMake Topic Stage
CommitDate: Mon Oct 1 17:01:01 2012 -0400
Merge topic 'ninja-LIBPATH' into next
2edc00b Revert "Ninja: don't expand any rsp files"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2edc00b48bae600a2e763071735c1adfd4214d91
commit 2edc00b48bae600a2e763071735c1adfd4214d91
Author: Bill Hoffman
AuthorDate: Mon Oct 1 16:20:42 2012 -0400
Commit: Brad King
CommitDate: Mon Oct 1 16:21:43 2012 -0400
Revert "Ninja: don't expand any rsp files"
This reverts commit 5598d9b2a06d4ec788b5e058435bb3bba99fd517.
Since commit f1670ab1 (Ninja: don't confuse ninja's rsp files with
nmake's, 2012-09-26) Ninja generator response files are placed in
CMakeFiles/ so the previously existing check already avoids expanding
them.
diff --git a/Modules/Platform/Windows-Intel.cmake
b/Modules/Platform/Windows-Intel.cmake
index a475a81..58da8c5 100644
--- a/Modules/Platform/Windows-Intel.cmake
+++ b/Modules/Platform/Windows-Intel.cmake
@@ -99,14 +99,11 @@ macro(__windows_compiler_intel lang)
set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/DNDEBUG /MD /Zi /O2")
if(_INTEL_COMPILER_SUPPORTS_MANIFEST)
-if(CMAKE_GENERATOR MATCHES "Ninja")
- set(NO_RSP_EXPAND _no_rsp_expand)
-endif()
set(CMAKE_${lang}_LINK_EXECUTABLE
- " -E vs_link_exe${NO_RSP_EXPAND}
${CMAKE_${lang}_LINK_EXECUTABLE}")
+ " -E vs_link_exe ${CMAKE_${lang}_LINK_EXECUTABLE}")
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
- " -E vs_link_dll${NO_RSP_EXPAND}
${CMAKE_${lang}_CREATE_SHARED_LIBRARY}")
+ " -E vs_link_dll ${CMAKE_${lang}_CREATE_SHARED_LIBRARY}")
set(CMAKE_${lang}_CREATE_SHARED_MODULE
- " -E vs_link_dll${NO_RSP_EXPAND}
${CMAKE_${lang}_CREATE_SHARED_MODULE}")
+ " -E vs_link_dll ${CMAKE_${lang}_CREATE_SHARED_MODULE}")
endif()
endmacro()
diff --git a/Modules/Platform/Windows-MSVC.cmake
b/Modules/Platform/Windows-MSVC.cmake
index 57b079f..1f28c50 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -212,11 +212,8 @@ set (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT
${CMAKE_EXE_LINKER_FLAGS_MINSIZER
macro(__windows_compiler_msvc lang)
if(NOT "${CMAKE_${lang}_COMPILER_VERSION}" VERSION_LESS 14)
# for 2005 make sure the manifest is put in the dll with mt
-if(CMAKE_GENERATOR MATCHES "Ninja")
- set(NO_RSP_EXPAND _no_rsp_expand)
-endif()
-set(_CMAKE_VS_LINK_DLL " -E vs_link_dll${NO_RSP_EXPAND} ")
-set(_CMAKE_VS_LINK_EXE " -E vs_link_exe${NO_RSP_EXPAND} ")
+set(_CMAKE_VS_LINK_DLL " -E vs_link_dll ")
+set(_CMAKE_VS_LINK_EXE " -E vs_link_exe ")
endif()
set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
"${_CMAKE_VS_LINK_DLL} ${CMAKE_CL_NOLOGO}
${CMAKE_START_TEMP_FILE} /out: /implib:
/pdb: /dll /version:.
${CMAKE_END_TEMP_FILE}")
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 0617b17..0123427 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1687,19 +1687,11 @@ int
cmake::ExecuteCMakeCommand(std::vector& args)
}
else if (args[1] == "vs_link_exe")
{
- return cmake::VisualStudioLink(args, 1, false);
+ return cmake::VisualStudioLink(args, 1);
}
else if (args[1] == "vs_link_dll")
{
- return cmake::VisualStudioLink(args, 2, false);
- }
-else if (args[1] == "vs_link_exe_no_rsp_expand")
- {
- return cmake::VisualStudioLink(args, 1, true);
- }
-else if (args[1] == "vs_link_dll_no_rsp_expand")
- {
- return cmake::VisualStudioLink(args, 2, true);
+ return cmake::VisualStudioLink(args, 2);
}
#ifdef CMAKE_BUILD_WITH_CMAKE
// Internal CMake color makefile support.
@@ -4025,8 +4017,7 @@ static bool cmakeCheckStampList(const char* stampList)
// For visual studio 2005 and newer manifest files need to be embeded into
// exe and dll's. T
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2600-g276ce96
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 276ce96bebf099c89ad15c6bf9974a28e4ee2f75 (commit)
via 98d52cfd1e6008cf03264aea86a14ae540d3ddb2 (commit)
via 2557e84d672cc50e30c8934e06de10c6080dc092 (commit)
from 7322d370a47cd0f0b85a333f68dfe54bc2e22558 (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=276ce96bebf099c89ad15c6bf9974a28e4ee2f75
commit 276ce96bebf099c89ad15c6bf9974a28e4ee2f75
Merge: 7322d37 98d52cf
Author: Bill Hoffman
AuthorDate: Wed Mar 20 17:59:25 2013 -0400
Commit: CMake Topic Stage
CommitDate: Wed Mar 20 17:59:25 2013 -0400
Merge topic 'ep_retry_clone' into next
98d52cf Retry three times on a failed git clone.
2557e84 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98d52cfd1e6008cf03264aea86a14ae540d3ddb2
commit 98d52cfd1e6008cf03264aea86a14ae540d3ddb2
Author: Bill Hoffman
AuthorDate: Wed Mar 20 17:54:49 2013 -0400
Commit: Bill Hoffman
CommitDate: Wed Mar 20 17:54:49 2013 -0400
Retry three times on a failed git clone.
Gitorious sometimes fails to clone repositories. This change has
external project try 3 times before giving up.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index bf2892b..95ec171 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -287,11 +287,20 @@ if(error_code)
message(FATAL_ERROR \"Failed to remove directory: '${source_dir}'\")
endif()
-execute_process(
- COMMAND \"${git_EXECUTABLE}\" clone \"${git_repository}\" \"${src_name}\"
- WORKING_DIRECTORY \"${work_dir}\"
- RESULT_VARIABLE error_code
- )
+# try the clone 3 times incase there is an odd git clone issue
+set(error_code 1)
+set(number_of_tries 0)
+while(error_code AND number_of_tries LESS 3)
+ execute_process(
+COMMAND \"${git_EXECUTABLE}\" clone \"${git_repository}\" \"${src_name}\"
+WORKING_DIRECTORY \"${work_dir}\"
+RESULT_VARIABLE error_code
+)
+endwhile()
+if(number_of_tries GREATER 1)
+ message(STATUS \"Had to git clone more than once:
+ \${number_of_tries} times.\")
+endif()
if(error_code)
message(FATAL_ERROR \"Failed to clone repository: '${git_repository}'\")
endif()
---
Summary of changes:
Modules/ExternalProject.cmake | 19 ++-
Source/CMakeVersion.cmake |2 +-
2 files changed, 15 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, next, updated. v2.8.10.2-2643-g289c3d1
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 289c3d10c21cd56c223017bd6c8b3cb6f4fccd1a (commit)
via 909b9f7926e839c5c8e081fea7eec0d8edcf7f12 (commit)
from 17fe46a437bb8ce2400cdf1e8a7f89c7b0373b71 (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=289c3d10c21cd56c223017bd6c8b3cb6f4fccd1a
commit 289c3d10c21cd56c223017bd6c8b3cb6f4fccd1a
Merge: 17fe46a 909b9f7
Author: Bill Hoffman
AuthorDate: Mon Mar 25 15:20:10 2013 -0400
Commit: CMake Topic Stage
CommitDate: Mon Mar 25 15:20:10 2013 -0400
Merge topic 'ep_retry_clone' into next
909b9f7 Incremenat the number of trys for git clones.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=909b9f7926e839c5c8e081fea7eec0d8edcf7f12
commit 909b9f7926e839c5c8e081fea7eec0d8edcf7f12
Author: Bill Hoffman
AuthorDate: Mon Mar 25 15:18:37 2013 -0400
Commit: Bill Hoffman
CommitDate: Mon Mar 25 15:18:37 2013 -0400
Incremenat the number of trys for git clones.
This fixes a bug where the number of try variable was not
incremented each time a git clone was attempted.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 95ec171..40e14d5 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -296,6 +296,7 @@ while(error_code AND number_of_tries LESS 3)
WORKING_DIRECTORY \"${work_dir}\"
RESULT_VARIABLE error_code
)
+ math(EXPR number_of_tries \"\${number_of_tries} + 1\")
endwhile()
if(number_of_tries GREATER 1)
message(STATUS \"Had to git clone more than once:
---
Summary of changes:
Modules/ExternalProject.cmake |1 +
1 files changed, 1 insertions(+), 0 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.11-2558-g37c88ae
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 37c88ae73113798fe3d248c3e5d24ad9017feb89 (commit)
via 01eaee777bb3f790fff97fd1d0bf58b4cf18a8a2 (commit)
from a87bb9050cef6332464efbf44fa7a24ffce80dbc (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=37c88ae73113798fe3d248c3e5d24ad9017feb89
commit 37c88ae73113798fe3d248c3e5d24ad9017feb89
Merge: a87bb90 01eaee7
Author: Bill Hoffman
AuthorDate: Thu Jun 6 12:52:46 2013 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 6 12:52:46 2013 -0400
Merge topic 'remove_extra_matches' into next
01eaee7 Remove extra MATCH_ variable sets when not neeeded.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01eaee777bb3f790fff97fd1d0bf58b4cf18a8a2
commit 01eaee777bb3f790fff97fd1d0bf58b4cf18a8a2
Author: Bill Hoffman
AuthorDate: Thu Jun 6 12:50:20 2013 -0400
Commit: Bill Hoffman
CommitDate: Thu Jun 6 12:50:20 2013 -0400
Remove extra MATCH_ variable sets when not neeeded.
This change increased the configure time for ParaView by 10 seconds. Without
the change 1,000,000 set to empty/ set to empty calls were being made. After
the change only 100,000 MATCH verables were set for the same code.
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 1fbde01..68ba13f 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -534,8 +534,12 @@ void cmStringCommand::ClearMatches(cmMakefile* mf)
{
char name[128];
sprintf(name, "CMAKE_MATCH_%d", i);
-mf->AddDefinition(name, "");
-mf->MarkVariableAsUsed(name);
+const char* s = mf->GetDefinition(name);
+if(s && *s != 0)
+ {
+ mf->AddDefinition(name, "");
+ mf->MarkVariableAsUsed(name);
+ }
}
}
@@ -544,10 +548,14 @@ void cmStringCommand::StoreMatches(cmMakefile*
mf,cmsys::RegularExpression& re)
{
for (unsigned int i=0; i<10; i++)
{
-char name[128];
-sprintf(name, "CMAKE_MATCH_%d", i);
-mf->AddDefinition(name, re.match(i).c_str());
-mf->MarkVariableAsUsed(name);
+std::string m = re.match(i);
+if(m.size() > 0)
+ {
+ char name[128];
+ sprintf(name, "CMAKE_MATCH_%d", i);
+ mf->AddDefinition(name, re.match(i).c_str());
+ mf->MarkVariableAsUsed(name);
+ }
}
}
---
Summary of changes:
Source/cmStringCommand.cxx | 20 ++--
1 files changed, 14 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, next, updated. v3.1.0-1813-gdb293e1
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 db293e1ca64acb9302b6ca660e94aee305045055 (commit)
via c7e52683d35883c9f7f46574bf357d0c7ed3bb7f (commit)
from 3f421206324fc57cfda97ef50e57e0c8c3ce1a40 (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=db293e1ca64acb9302b6ca660e94aee305045055
commit db293e1ca64acb9302b6ca660e94aee305045055
Merge: 3f42120 c7e5268
Author: Bill Hoffman
AuthorDate: Mon Jan 12 17:34:36 2015 -0500
Commit: CMake Topic Stage
CommitDate: Mon Jan 12 17:34:36 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
c7e52683 Handle the case when there is no upload file or type.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7e52683d35883c9f7f46574bf357d0c7ed3bb7f
commit c7e52683d35883c9f7f46574bf357d0c7ed3bb7f
Author: Bill Hoffman
AuthorDate: Mon Jan 12 17:33:58 2015 -0500
Commit: Bill Hoffman
CommitDate: Mon Jan 12 17:33:58 2015 -0500
Handle the case when there is no upload file or type.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx
b/Source/CTest/cmCTestSubmitHandler.cxx
index 71491d8..2f6a9e9 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1209,11 +1209,12 @@ int
cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
//
int cmCTestSubmitHandler::ProcessHandler()
{
- std::string cdashUploadFile = this->GetOption("CDashUploadFile");
- std::string cdashUploadType = this->GetOption("CDashUploadType");
- if(cdashUploadFile.size())
+ const char* cdashUploadFile = this->GetOption("CDashUploadFile");
+ const char* cdashUploadType = this->GetOption("CDashUploadType");
+ if(cdashUploadFile && cdashUploadType)
{
-return this->HandleCDashUploadFile(cdashUploadFile, cdashUploadType);
+return this->HandleCDashUploadFile(std::string(cdashUploadFile),
+ std::string(cdashUploadType));
}
std::string iscdash = this->CTest->GetCTestConfiguration("IsCDash");
// cdash does not need to trigger so just return true
---
Summary of changes:
Source/CTest/cmCTestSubmitHandler.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1823-g87c9680
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 87c968015515351aacbee47779194e1df43b512e (commit)
via 8bba38161855deaa90fe72057f6cd4564110d551 (commit)
from 56db783f0c5e882d45c6f78f5d46dbf3f1c09ae4 (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=87c968015515351aacbee47779194e1df43b512e
commit 87c968015515351aacbee47779194e1df43b512e
Merge: 56db783 8bba381
Author: Bill Hoffman
AuthorDate: Tue Jan 13 10:59:44 2015 -0500
Commit: CMake Topic Stage
CommitDate: Tue Jan 13 10:59:44 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
8bba3816 Do not set the options on the handler if they are not used.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bba38161855deaa90fe72057f6cd4564110d551
commit 8bba38161855deaa90fe72057f6cd4564110d551
Author: Bill Hoffman
AuthorDate: Tue Jan 13 10:58:40 2015 -0500
Commit: Bill Hoffman
CommitDate: Tue Jan 13 10:58:40 2015 -0500
Do not set the options on the handler if they are not used.
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx
b/Source/CTest/cmCTestSubmitCommand.cxx
index c608034..dcd7982 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -145,10 +145,13 @@ cmCTestGenericHandler*
cmCTestSubmitCommand::InitializeHandler()
static_cast(handler)->SetOption("InternalTest",
this->InternalTest ? "ON" : "OFF");
- static_cast(handler)->
-SetOption("CDashUploadFile", this->CDashUploadFile.c_str());
- static_cast(handler)->
-SetOption("CDashUploadType", this->CDashUploadType.c_str());
+ if(this->CDashUploadFile.size())
+{
+static_cast(handler)->
+ SetOption("CDashUploadFile", this->CDashUploadFile.c_str());
+static_cast(handler)->
+ SetOption("CDashUploadType", this->CDashUploadType.c_str());
+}
return handler;
}
---
Summary of changes:
Source/CTest/cmCTestSubmitCommand.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-1988-g4dc9ac8
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 4dc9ac8e94e6bfae374b98c6afa3efbb6ca76d58 (commit)
via acdab825420512a8bfb5f337faa4a7fe7ded3279 (commit)
from 27e9e847d18de8df5ddafa72d6db80e9b657fb45 (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=4dc9ac8e94e6bfae374b98c6afa3efbb6ca76d58
commit 4dc9ac8e94e6bfae374b98c6afa3efbb6ca76d58
Merge: 27e9e84 acdab82
Author: Bill Hoffman
AuthorDate: Thu Jan 15 18:07:58 2015 -0500
Commit: CMake Topic Stage
CommitDate: Thu Jan 15 18:07:58 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
acdab825 Use the full path to the gcda file, and use bzip2 compress for tar
files.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acdab825420512a8bfb5f337faa4a7fe7ded3279
commit acdab825420512a8bfb5f337faa4a7fe7ded3279
Author: Bill Hoffman
AuthorDate: Thu Jan 15 18:05:29 2015 -0500
Commit: Bill Hoffman
CommitDate: Thu Jan 15 18:05:29 2015 -0500
Use the full path to the gcda file, and use bzip2 compress for tar files.
bzip2 does not put any date stamp in, and CDash can uncompress it, so
compress
the tar file.
diff --git a/Modules/CTestCoverageCollectGCOV.cmake
b/Modules/CTestCoverageCollectGCOV.cmake
index 551fbd0..29fd504 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -94,6 +94,7 @@ function(ctest_coverage_collect_gcov)
# call gcov on each .gcda file
foreach (gcda_file ${gcda_files})
# get the directory of the gcda file
+get_filename_component(gcda_file ${binary_dir}/${gcda_file} ABSOLUTE)
get_filename_component(gcov_dir ${gcda_file} DIRECTORY)
# run gcov, this will produce the .gcov file in the current
# working directory
@@ -115,7 +116,7 @@ function(ctest_coverage_collect_gcov)
# sum will be the same for the tar file independent of file time
# stamps
execute_process(COMMAND
-${CMAKE_COMMAND} -E tar cvf ${GCOV_TARBALL}
+${CMAKE_COMMAND} -E tar cvfj ${GCOV_TARBALL}
--mtime=1970-01-01\ 0:0:0\ UTC ${gcov_files}
${coverage_dir}/data.json ${label_files}
WORKING_DIRECTORY ${binary_dir})
---
Summary of changes:
Modules/CTestCoverageCollectGCOV.cmake |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-2283-g7589b5f
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 7589b5fe25daa4fc154ae0ea6999e6e89f7d1bdb (commit)
via d795a3d51274e6398da4ac59ee86943a5138f6d2 (commit)
from a75bb8377e228107917135b06a1af42aec1ecd52 (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=7589b5fe25daa4fc154ae0ea6999e6e89f7d1bdb
commit 7589b5fe25daa4fc154ae0ea6999e6e89f7d1bdb
Merge: a75bb83 d795a3d
Author: Bill Hoffman
AuthorDate: Wed Jan 21 14:22:27 2015 -0500
Commit: CMake Topic Stage
CommitDate: Wed Jan 21 14:22:27 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
d795a3d5 Only glob in the coverage dir for the gcov files instead of the
whole tree.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d795a3d51274e6398da4ac59ee86943a5138f6d2
commit d795a3d51274e6398da4ac59ee86943a5138f6d2
Author: Bill Hoffman
AuthorDate: Wed Jan 21 14:15:23 2015 -0500
Commit: Bill Hoffman
CommitDate: Wed Jan 21 14:15:23 2015 -0500
Only glob in the coverage dir for the gcov files instead of the whole tree.
diff --git a/Modules/CTestCoverageCollectGCOV.cmake
b/Modules/CTestCoverageCollectGCOV.cmake
index 3a9b421..f6616e0 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -126,7 +126,7 @@ function(ctest_coverage_collect_gcov)
}")
# collect the gcov files
set(gcov_files)
- file(GLOB_RECURSE gcov_files RELATIVE ${binary_dir} "${binary_dir}/*.gcov")
+ file(GLOB_RECURSE gcov_files RELATIVE ${binary_dir} "${coverage_dir}/*.gcov")
# tar up the coverage info with the same date so that the md5
# sum will be the same for the tar file independent of file time
# stamps
---
Summary of changes:
Modules/CTestCoverageCollectGCOV.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.1-2468-gd9a5a1f
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 d9a5a1f7e5bdb5960d153a00595a237e4f69e97b (commit)
via 1e10b57a9c49cdace423970d14514b3462ce61f4 (commit)
from fcfce76d09ba7d5337ed8e198b9998d7d2f6f5fc (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=d9a5a1f7e5bdb5960d153a00595a237e4f69e97b
commit d9a5a1f7e5bdb5960d153a00595a237e4f69e97b
Merge: fcfce76 1e10b57
Author: Bill Hoffman
AuthorDate: Thu Jan 29 12:32:29 2015 -0500
Commit: CMake Topic Stage
CommitDate: Thu Jan 29 12:32:29 2015 -0500
Merge topic 'fix-cpack-symlink-create-dir' into next
1e10b57a Fix bug where symlink could not be created because directory did
not exist.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e10b57a9c49cdace423970d14514b3462ce61f4
commit 1e10b57a9c49cdace423970d14514b3462ce61f4
Author: Bill Hoffman
AuthorDate: Thu Jan 29 11:52:30 2015 -0500
Commit: Bill Hoffman
CommitDate: Thu Jan 29 11:52:30 2015 -0500
Fix bug where symlink could not be created because directory did not exist.
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index f21fcf6..9d3d9fd 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -435,8 +435,16 @@ int
cmCPackGenerator::InstallProjectViaInstalledDirectories(
++symlinkedIt)
{
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Will create a symlink: "
- << symlinkedIt->second << "--> "
- << symlinkedIt->first << std::endl);
+<< symlinkedIt->second << "--> "
+<< symlinkedIt->first << std::endl);
+ // make sure directory exists for symlink
+ std::string destDir =
+cmSystemTools::GetFilenamePath(symlinkedIt->second);
+ if(!cmSystemTools::MakeDirectory(destDir))
+{
+cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot create dir: "
+ << destDir << std::endl);
+}
if (!cmSystemTools::CreateSymlink(symlinkedIt->first,
symlinkedIt->second))
{
---
Summary of changes:
Source/CPack/cmCPackGenerator.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.1-2470-g9eaeba8
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 9eaeba8f0bcff213de7a42eebe1c9a46ffe78e65 (commit)
via f3f323044344e250f9235ed820f3b28c5b2b3dde (commit)
from d9a5a1f7e5bdb5960d153a00595a237e4f69e97b (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=9eaeba8f0bcff213de7a42eebe1c9a46ffe78e65
commit 9eaeba8f0bcff213de7a42eebe1c9a46ffe78e65
Merge: d9a5a1f f3f3230
Author: Bill Hoffman
AuthorDate: Thu Jan 29 14:34:11 2015 -0500
Commit: CMake Topic Stage
CommitDate: Thu Jan 29 14:34:11 2015 -0500
Merge topic 'fix-cpack-symlink-create-dir' into next
f3f32304 Put a check in to make sure there is a directory to create.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3f323044344e250f9235ed820f3b28c5b2b3dde
commit f3f323044344e250f9235ed820f3b28c5b2b3dde
Author: Bill Hoffman
AuthorDate: Thu Jan 29 14:22:43 2015 -0500
Commit: Bill Hoffman
CommitDate: Thu Jan 29 14:22:43 2015 -0500
Put a check in to make sure there is a directory to create.
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 9d3d9fd..9e33d23 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -440,10 +440,14 @@ int
cmCPackGenerator::InstallProjectViaInstalledDirectories(
// make sure directory exists for symlink
std::string destDir =
cmSystemTools::GetFilenamePath(symlinkedIt->second);
- if(!cmSystemTools::MakeDirectory(destDir))
+ if(!destDir.empty() && !cmSystemTools::MakeDirectory(destDir))
{
cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot create dir: "
- << destDir << std::endl);
+ << destDir
+ << "\nTrying to create symlink: "
+ << symlinkedIt->second << "--> "
+ << symlinkedIt->first
+ << std::endl);
}
if (!cmSystemTools::CreateSymlink(symlinkedIt->first,
symlinkedIt->second))
---
Summary of changes:
Source/CPack/cmCPackGenerator.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.1-2482-gfaeef84
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 faeef8432b3bcf7623846de2b1715de3b2acdb13 (commit)
via 8037aa78c90c3a356a15efe102b1ee7cfcba3d34 (commit)
via fc681b4a0e88f65a7875f70a287511f402f307a0 (commit)
via eada43bb220f5f3953874606eb97ba33217091e4 (commit)
from 35165bdcdac5a6450b8123a9eaf925f94ad90448 (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=faeef8432b3bcf7623846de2b1715de3b2acdb13
commit faeef8432b3bcf7623846de2b1715de3b2acdb13
Merge: 35165bd 8037aa7
Author: Bill Hoffman
AuthorDate: Thu Jan 29 15:40:41 2015 -0500
Commit: CMake Topic Stage
CommitDate: Thu Jan 29 15:40:41 2015 -0500
Merge topic 'clean_up_cdash_upload_files' into next
8037aa78 Only clean up curl once in the cmCTestCurl object.
fc681b4a Call curl_easy_escape on arguments sent to CDash upload.
eada43bb Use the --files-from option to tar to handle lots of files, also
add a test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8037aa78c90c3a356a15efe102b1ee7cfcba3d34
commit 8037aa78c90c3a356a15efe102b1ee7cfcba3d34
Author: Bill Hoffman
AuthorDate: Thu Jan 29 15:39:42 2015 -0500
Commit: Bill Hoffman
CommitDate: Thu Jan 29 15:39:42 2015 -0500
Only clean up curl once in the cmCTestCurl object.
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index 1668edf..b4c0137 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -174,7 +174,6 @@ bool cmCTestCurl::UploadFile(std::string const& local_file,
// Now run off and do what you've been told!
::curl_easy_perform(this->Curl);
::fclose(ftpfile);
- ::curl_global_cleanup();
if ( responseData.size() > 0 )
{
@@ -227,8 +226,6 @@ bool cmCTestCurl::HttpRequest(std::string const& url,
CURLcode res = ::curl_easy_perform(this->Curl);
- ::curl_easy_cleanup(this->Curl);
- ::curl_global_cleanup();
if ( responseData.size() > 0 )
{
response = std::string(responseData.begin(), responseData.end());
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc681b4a0e88f65a7875f70a287511f402f307a0
commit fc681b4a0e88f65a7875f70a287511f402f307a0
Author: Bill Hoffman
AuthorDate: Thu Jan 29 14:42:44 2015 -0500
Commit: Bill Hoffman
CommitDate: Thu Jan 29 14:42:44 2015 -0500
Call curl_easy_escape on arguments sent to CDash upload.
diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx
index b0d26cc..1668edf 100644
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@@ -25,6 +25,21 @@ cmCTestCurl::cmCTestCurl(cmCTest* ctest)
this->VerifyPeerOff = false;
this->VerifyHostOff = false;
this->TimeOutSeconds = 0;
+ this->Curl = curl_easy_init();
+}
+
+cmCTestCurl::~cmCTestCurl()
+{
+ ::curl_easy_cleanup(this->Curl);
+ ::curl_global_cleanup();
+}
+
+std::string cmCTestCurl::Escape(std::string const& source)
+{
+ char* data1 = curl_easy_escape(this->Curl, source.c_str(), 0);
+ std::string ret = data1;
+ curl_free(data1);
+ return ret;
}
namespace
@@ -73,7 +88,6 @@ void cmCTestCurl::SetCurlOptions(std::vector
const& args)
bool cmCTestCurl::InitCurl()
{
- this->Curl = curl_easy_init();
if(!this->Curl)
{
return false;
diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h
index 5bb8b41..0737bb6 100644
--- a/Source/CTest/cmCTestCurl.h
+++ b/Source/CTest/cmCTestCurl.h
@@ -22,6 +22,7 @@ class cmCTestCurl
{
public:
cmCTestCurl(cmCTest*);
+ ~cmCTestCurl();
bool UploadFile(std::string const& url,
std::string const& file,
std::string const& fields,
@@ -34,6 +35,7 @@ public:
void SetCurlOptions(std::vector const& args);
void SetUseHttp10On() { this->UseHttp10 = true;}
void SetTimeOutSeconds(int s) { this->TimeOutSeconds = s;}
+ std::string Escape(std::string const& source);
protected:
void SetProxyType();
bool InitCurl();
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx
b/Source/CTest/cmCTestSubmitHandler.cxx
index 3d9545f..5b52df7 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1128,21 +1128,24 @@ int
cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file,
// TODO: Encode values for a URL instead of trusting caller.
std::ostringstream str;
str << "project="
- << this->CTest->GetCTestConfiguration("ProjectName") << "&";
+ << curl.Escape(this->
[Cmake-commits] CMake branch, next, updated. v3.1.1-2526-g01cd4d7
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 01cd4d7da617553f3f0322c1ab6bb2304e652855 (commit)
via dd8fccdc0f0e64c45f7098da497262454678721f (commit)
from 569a549c79b6d8bd349727ad274881f15cdef7c2 (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=01cd4d7da617553f3f0322c1ab6bb2304e652855
commit 01cd4d7da617553f3f0322c1ab6bb2304e652855
Merge: 569a549 dd8fccd
Author: Bill Hoffman
AuthorDate: Fri Jan 30 11:37:51 2015 -0500
Commit: CMake Topic Stage
CommitDate: Fri Jan 30 11:37:51 2015 -0500
Merge topic 'clean_up_cdash_upload_files' into next
dd8fccdc Make CTest GCOV_EXTRA_OPTIONS work like CoverageExtraFlags.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd8fccdc0f0e64c45f7098da497262454678721f
commit dd8fccdc0f0e64c45f7098da497262454678721f
Author: Bill Hoffman
AuthorDate: Fri Jan 30 11:34:16 2015 -0500
Commit: Bill Hoffman
CommitDate: Fri Jan 30 11:34:16 2015 -0500
Make CTest GCOV_EXTRA_OPTIONS work like CoverageExtraFlags.
In the existing gcov code, if you set CTEST_COVERAGE_EXTRA_FLAGS, they get
put on the command line before the -o. In this case we remove the -b
and replace it with GCOV_EXTRA_OPTIONS. All other arguments remain the
same.
diff --git a/Modules/CTestCoverageCollectGCOV.cmake
b/Modules/CTestCoverageCollectGCOV.cmake
index edb1466..08f0805 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -44,7 +44,7 @@
# Specify extra options to be passed to gcov. By default
# gcov is run like this gcov -b -o ${gcov_dir} ${gcda_file_path}
# If GCOV_EXTRA_OPTIONS are specified, it will be run like this:
-# ``gcov`` ${GCOV_EXTRA_OPTIONS} ${gcov_dir} ${gcda_file_path}
+# ``gcov`` ${GCOV_EXTRA_OPTIONS} -o ${gcov_dir} ${gcda_file_path}
#=
@@ -121,10 +121,10 @@ function(ctest_coverage_collect_gcov)
# run gcov, this will produce the .gcov file in the current
# working directory
if(NOT DEFINED GCOV_GCOV_EXTRA_OPTIONS)
- set(GCOV_GCOV_EXTRA_OPTIONS -b -o)
+ set(GCOV_GCOV_EXTRA_OPTIONS -b)
endif()
execute_process(COMMAND
- ${gcov_command} ${GCOV_GCOV_EXTRA_OPTIONS} ${gcov_dir} ${gcda_file}
+ ${gcov_command} ${GCOV_GCOV_EXTRA_OPTIONS} -o ${gcov_dir} ${gcda_file}
OUTPUT_VARIABLE out
RESULT_VARIABLE res
WORKING_DIRECTORY ${coverage_dir})
---
Summary of changes:
Modules/CTestCoverageCollectGCOV.cmake |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.0-978-gecce429
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 ecce4291e6ccf51902d16cff862d3a0c729f4802 (commit)
via 8c68af5e7628d7d18bd3e34e300044c459b9acfe (commit)
via 169c867f5671fa6cca2fde53b9d7732c348c7499 (commit)
via 5c3c29ffd3a36e710792d7b9954bf3ec95cee58a (commit)
from d88859dfcdc4e4dd1e00a854bb4115d7b230a72a (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=ecce4291e6ccf51902d16cff862d3a0c729f4802
commit ecce4291e6ccf51902d16cff862d3a0c729f4802
Merge: d88859d 8c68af5
Author: Bill Hoffman
AuthorDate: Tue Mar 10 18:20:24 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 10 18:20:24 2015 -0400
Merge topic 'add_repeat_testing' into next
8c68af5e Add a test for the run until fail ctest option.
169c867f Fix some unitialized class variables.
5c3c29ff Add a new --repeat-until-fail option to ctest.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c68af5e7628d7d18bd3e34e300044c459b9acfe
commit 8c68af5e7628d7d18bd3e34e300044c459b9acfe
Author: Bill Hoffman
AuthorDate: Tue Mar 10 18:08:01 2015 -0400
Commit: Bill Hoffman
CommitDate: Tue Mar 10 18:08:01 2015 -0400
Add a test for the run until fail ctest option.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 08765de..4300c7e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2583,6 +2583,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND}
--output-on-failure -C "\${CTestTest_CONFIG}")
+ add_test_macro(CTestTestRunUntilFail ${CMAKE_CTEST_COMMAND}
+--repeat-until-fail 4 -C "\${CTestTest_CONFIG}")
+ set_tests_properties(CTestTestRunUntilFail PROPERTIES
+PASS_REGULAR_EXPRESSION
+"1/2.*Test #1:.* initialization.*Passed.*Test #2.*test1.*Failed"
+ )
+
if(NOT BORLAND)
set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)
add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4
diff --git a/Tests/CTestTestRunUntilFail/CMakeLists.txt
b/Tests/CTestTestRunUntilFail/CMakeLists.txt
new file mode 100644
index 000..7788d73
--- /dev/null
+++ b/Tests/CTestTestRunUntilFail/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 2.8.12)
+project(CTestTestSerialOrder)
+enable_testing()
+set(TEST_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/test_output.txt")
+add_test(NAME initialization
+ COMMAND ${CMAKE_COMMAND}
+ "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
+ -P "${CMAKE_CURRENT_SOURCE_DIR}/init.cmake")
+add_test(NAME test1
+ COMMAND ${CMAKE_COMMAND}
+ "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
+ -P "${CMAKE_CURRENT_SOURCE_DIR}/test1.cmake")
+set_tests_properties(test1 PROPERTIES DEPENDS "initialization")
diff --git a/Tests/CTestTestRunUntilFail/init.cmake
b/Tests/CTestTestRunUntilFail/init.cmake
new file mode 100644
index 000..560fb5e
--- /dev/null
+++ b/Tests/CTestTestRunUntilFail/init.cmake
@@ -0,0 +1 @@
+file(WRITE "${TEST_OUTPUT_FILE}" "0")
diff --git a/Tests/CTestTestRunUntilFail/test1.cmake
b/Tests/CTestTestRunUntilFail/test1.cmake
new file mode 100644
index 000..d7fafb8
--- /dev/null
+++ b/Tests/CTestTestRunUntilFail/test1.cmake
@@ -0,0 +1,8 @@
+message("TEST_OUTPUT_FILE = ${TEST_OUTPUT_FILE}")
+file(READ "${TEST_OUTPUT_FILE}" COUNT)
+message("COUNT= ${COUNT}")
+math(EXPR COUNT "${COUNT} + 1")
+file(WRITE "${TEST_OUTPUT_FILE}" "${COUNT}")
+if(${COUNT} EQUAL 2)
+ message(FATAL_ERROR "this test fails on the 2nd run")
+endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=169c867f5671fa6cca2fde53b9d7732c348c7499
commit 169c867f5671fa6cca2fde53b9d7732c348c7499
Author: Bill Hoffman
AuthorDate: Mon Mar 9 16:07:22 2015 -0400
Commit: Bill Hoffman
CommitDate: Mon Mar 9 16:07:22 2015 -0400
Fix some unitialized class variables.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 2f89963..55e2a44 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -328,6 +328,8 @@ cmCTest::cmCTest()
this->OutputTestOutputOnTestFailure = false;
this->ComputedCompressTestOutput = false;
this->ComputedCompressMemCheckOutput = false;
+ this->RepeatTests = 1; // default to run each test once
+ this->RepeatUntilFail = false;
if(cmSystemTools::GetEnv("CTEST_OUTPUT_ON_FAILURE"))
{
this->OutputTestOutputOnTestFailure = true;
http://cmake.org/gitweb?p=cmake.git;
[Cmake-commits] CMake branch, next, updated. v3.2.0-1003-gb94fa03
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 b94fa03c9363908624585311954eeca0c209c3d7 (commit)
via 9eabfb57e72158c58c59631390c0dea969d9ecb4 (commit)
from fefa0152b87e56facf57e87f78f1acb78e87f8b4 (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=b94fa03c9363908624585311954eeca0c209c3d7
commit b94fa03c9363908624585311954eeca0c209c3d7
Merge: fefa015 9eabfb5
Author: Bill Hoffman
AuthorDate: Tue Mar 10 20:58:36 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 10 20:58:36 2015 -0400
Merge topic 'add_repeat_testing' into next
9eabfb57 Fix the project name to match the test name.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9eabfb57e72158c58c59631390c0dea969d9ecb4
commit 9eabfb57e72158c58c59631390c0dea969d9ecb4
Author: Bill Hoffman
AuthorDate: Tue Mar 10 20:56:58 2015 -0400
Commit: Bill Hoffman
CommitDate: Tue Mar 10 20:56:58 2015 -0400
Fix the project name to match the test name.
diff --git a/Tests/CTestTestRunUntilFail/CMakeLists.txt
b/Tests/CTestTestRunUntilFail/CMakeLists.txt
index 7788d73..62f4814 100644
--- a/Tests/CTestTestRunUntilFail/CMakeLists.txt
+++ b/Tests/CTestTestRunUntilFail/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.12)
-project(CTestTestSerialOrder)
+project(CTestTestRunUntilFail)
enable_testing()
set(TEST_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/test_output.txt")
add_test(NAME initialization
---
Summary of changes:
Tests/CTestTestRunUntilFail/CMakeLists.txt |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1001-gab5aa68
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 ab5aa681784f35ea9177a7242d4c92354e0110c5 (commit)
via c82b25a69a79e7affae4c350ff7a3ae6e5672e00 (commit)
from e0c3ddaa028b3fefa03e38e407b91b2679839fe8 (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=ab5aa681784f35ea9177a7242d4c92354e0110c5
commit ab5aa681784f35ea9177a7242d4c92354e0110c5
Merge: e0c3dda c82b25a
Author: Bill Hoffman
AuthorDate: Wed Mar 11 18:57:07 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Mar 11 18:57:07 2015 -0400
Merge topic 'add_repeat_testing' into next
c82b25a6 Fix up documentation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c82b25a69a79e7affae4c350ff7a3ae6e5672e00
commit c82b25a69a79e7affae4c350ff7a3ae6e5672e00
Author: Bill Hoffman
AuthorDate: Wed Mar 11 18:55:37 2015 -0400
Commit: Bill Hoffman
CommitDate: Wed Mar 11 18:55:37 2015 -0400
Fix up documentation.
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index cc132c2..99d33e7 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -194,6 +194,12 @@ Options
subsequent calls to ctest with the --rerun-failed option will run
the set of tests that most recently failed (if any).
+``--repeat-until-fail N``
+ Run each test N times until N runs or a test fails.
+
+ This option allows you to run each test multiple times until a test failes.
+ This is useful in finding random failures in test cases.
+
``--max-width ``
Set the max width for a test name to output
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 351b644..069c45e 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -49,9 +49,6 @@ static const char * cmDocumentationOptions[][2] =
{"-F", "Enable failover."},
{"-j , --parallel ", "Run the tests in parallel using the "
"given number of jobs."},
- {"--repeat-until-fail ", "Run each test times "
- "unless the test fails at that point stop repeating. Useful for finding"
- " random failuers."},
{"-Q,--quiet", "Make ctest quiet."},
{"-O , --output-log ", "Output to log file"},
{"-N,--show-only", "Disable actual execution of tests."},
@@ -78,6 +75,8 @@ static const char * cmDocumentationOptions[][2] =
"Run a specific number of tests by number."},
{"-U, --union", "Take the Union of -I and -R"},
{"--rerun-failed", "Run only the tests that failed previously"},
+ {"--repeat-until-fail N", "Run each test N times"
+ " until the test runs N times or the test fails."},
{"--max-width ", "Set the max width for a test name to output"},
{"--interactive-debug-mode [0|1]", "Set the interactive mode to 0 or 1."},
{"--no-label-summary", "Disable timing summary information for labels."},
---
Summary of changes:
Help/manual/ctest.1.rst |6 ++
Source/ctest.cxx|5 ++---
2 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1021-g0a9885a
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 0a9885ab197a880c0841aeb93841e8744466fa94 (commit)
via 0b65f7fe6aa3f696ffa4dc9e461873050c15745e (commit)
from 259cff6357cba8ca026d1fe9dc98002c861b4c3d (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=0a9885ab197a880c0841aeb93841e8744466fa94
commit 0a9885ab197a880c0841aeb93841e8744466fa94
Merge: 259cff6 0b65f7f
Author: Bill Hoffman
AuthorDate: Fri Mar 13 20:01:08 2015 -0400
Commit: CMake Topic Stage
CommitDate: Fri Mar 13 20:01:08 2015 -0400
Merge topic 'add_repeat_testing' into next
0b65f7fe Add error checking to repeat until fail ctest option along with
tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b65f7fe6aa3f696ffa4dc9e461873050c15745e
commit 0b65f7fe6aa3f696ffa4dc9e461873050c15745e
Author: Bill Hoffman
AuthorDate: Fri Mar 13 19:58:39 2015 -0400
Commit: Bill Hoffman
CommitDate: Fri Mar 13 19:58:39 2015 -0400
Add error checking to repeat until fail ctest option along with tests.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 55e2a44..5f094e0 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1985,11 +1985,11 @@ bool cmCTest::CheckArgument(const std::string& arg,
const char* varg1,
//--
// Processes one command line argument (and its arguments if any)
// for many simple options and then returns
-void cmCTest::HandleCommandLineArguments(size_t &i,
- std::vector &args)
+bool cmCTest::HandleCommandLineArguments(size_t &i,
+ std::vector &args,
+ std::string& errormsg)
{
std::string arg = args[i];
-
if(this->CheckArgument(arg, "-F"))
{
this->Failover = true;
@@ -2007,11 +2007,25 @@ void cmCTest::HandleCommandLineArguments(size_t &i,
this->SetParallelLevel(plevel);
this->ParallelLevelSetInCli = true;
}
- if(this->CheckArgument(arg, "--repeat-until-fail") && i < args.size() - 1)
+ if(this->CheckArgument(arg, "--repeat-until-fail"))
{
+if( i >= args.size() - 1)
+ {
+ errormsg = "Usage: ctest --repeat-until-fail N";
+ return false;
+ }
i++;
-this->RepeatTests = atoi(args[i].c_str());
-this->RepeatUntilFail = true;
+long repeat = 1;
+if(!cmSystemTools::StringToLong(args[i].c_str(), &repeat))
+ {
+ errormsg = "Usage: ctest --repeat-until-fail N";
+ return false;
+ }
+this->RepeatTests = repeat;
+if(repeat > 1)
+ {
+ this->RepeatUntilFail = true;
+ }
}
if(this->CheckArgument(arg, "--no-compress-output"))
@@ -2198,6 +2212,7 @@ void cmCTest::HandleCommandLineArguments(size_t &i,
this->GetHandler("test")->SetPersistentOption("RerunFailed", "true");
this->GetHandler("memcheck")->SetPersistentOption("RerunFailed", "true");
}
+ return true;
}
//--
@@ -2280,7 +2295,12 @@ int cmCTest::Run(std::vector &args,
std::string* output)
for(size_t i=1; i < args.size(); ++i)
{
// handle the simple commandline arguments
-this->HandleCommandLineArguments(i,args);
+std::string errormsg;
+if(!this->HandleCommandLineArguments(i,args, errormsg))
+ {
+ cmSystemTools::Error(errormsg.c_str());
+ return 1;
+ }
// handle the script arguments -S -SR -SP
this->HandleScriptArguments(i,args,SRArgumentSpecified);
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 7fd84d8..3f033d9 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -540,8 +540,9 @@ private:
bool AddVariableDefinition(const std::string &arg);
//! parse and process most common command line arguments
- void HandleCommandLineArguments(size_t &i,
- std::vector &args);
+ bool HandleCommandLineArguments(size_t &i,
+ std::vector &args,
+ std::string& errormsg);
//! hande the -S -SP and -SR arguments
void HandleScriptArguments(size_t &i,
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index eb42057..ffda31f 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++
[Cmake-commits] CMake branch, next, updated. v3.2.1-1065-g4dbd32d
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 4dbd32d02224616177686afd8733a4ad03d0c298 (commit)
via 45063cf754673b88dfac19d1017382eedebe50dc (commit)
via 0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6 (commit)
from ca6f06607b0b93781483eaf77c071c1584d32867 (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=4dbd32d02224616177686afd8733a4ad03d0c298
commit 4dbd32d02224616177686afd8733a4ad03d0c298
Merge: ca6f066 45063cf
Author: Bill Hoffman
AuthorDate: Tue Mar 17 14:38:05 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 17 14:38:05 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
45063cf7 Remove standalone CTest run until fail test.
0d7f1664 Add testing for repeat until fail command line option to ctest.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45063cf754673b88dfac19d1017382eedebe50dc
commit 45063cf754673b88dfac19d1017382eedebe50dc
Author: Bill Hoffman
AuthorDate: Tue Mar 17 14:36:43 2015 -0400
Commit: Bill Hoffman
CommitDate: Tue Mar 17 14:36:43 2015 -0400
Remove standalone CTest run until fail test.
The test has been moved to the RunCMake style test.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4300c7e..08765de 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2583,13 +2583,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND}
--output-on-failure -C "\${CTestTest_CONFIG}")
- add_test_macro(CTestTestRunUntilFail ${CMAKE_CTEST_COMMAND}
---repeat-until-fail 4 -C "\${CTestTest_CONFIG}")
- set_tests_properties(CTestTestRunUntilFail PROPERTIES
-PASS_REGULAR_EXPRESSION
-"1/2.*Test #1:.* initialization.*Passed.*Test #2.*test1.*Failed"
- )
-
if(NOT BORLAND)
set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)
add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4
diff --git a/Tests/CTestTestRunUntilFail/CMakeLists.txt
b/Tests/CTestTestRunUntilFail/CMakeLists.txt
deleted file mode 100644
index 62f4814..000
--- a/Tests/CTestTestRunUntilFail/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(CTestTestRunUntilFail)
-enable_testing()
-set(TEST_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/test_output.txt")
-add_test(NAME initialization
- COMMAND ${CMAKE_COMMAND}
- "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
- -P "${CMAKE_CURRENT_SOURCE_DIR}/init.cmake")
-add_test(NAME test1
- COMMAND ${CMAKE_COMMAND}
- "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
- -P "${CMAKE_CURRENT_SOURCE_DIR}/test1.cmake")
-set_tests_properties(test1 PROPERTIES DEPENDS "initialization")
diff --git a/Tests/CTestTestRunUntilFail/init.cmake
b/Tests/CTestTestRunUntilFail/init.cmake
deleted file mode 100644
index 560fb5e..000
--- a/Tests/CTestTestRunUntilFail/init.cmake
+++ /dev/null
@@ -1 +0,0 @@
-file(WRITE "${TEST_OUTPUT_FILE}" "0")
diff --git a/Tests/CTestTestRunUntilFail/test1.cmake
b/Tests/CTestTestRunUntilFail/test1.cmake
deleted file mode 100644
index d7fafb8..000
--- a/Tests/CTestTestRunUntilFail/test1.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-message("TEST_OUTPUT_FILE = ${TEST_OUTPUT_FILE}")
-file(READ "${TEST_OUTPUT_FILE}" COUNT)
-message("COUNT= ${COUNT}")
-math(EXPR COUNT "${COUNT} + 1")
-file(WRITE "${TEST_OUTPUT_FILE}" "${COUNT}")
-if(${COUNT} EQUAL 2)
- message(FATAL_ERROR "this test fails on the 2nd run")
-endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6
commit 0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6
Author: Bill Hoffman
AuthorDate: Tue Mar 17 13:51:12 2015 -0400
Commit: Bill Hoffman
CommitDate: Tue Mar 17 14:04:54 2015 -0400
Add testing for repeat until fail command line option to ctest.
This adds more complete testing. It checks that the output is
as expected when ctest is run on a project with several tests
including one that fails on the second run only.
diff --git a/Tests/RunCMake/CTestCommandLine/Build.cmake
b/Tests/RunCMake/CTestCommandLine/Build.cmake
new file mode 100644
index 000..4654416
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/Build.cmake
@@ -0,0 +1,15 @@
+enable_testing()
+
+set(TEST_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/test_output.txt")
+add_test(NAME initialization
+ COMMA
[Cmake-commits] CMake branch, next, updated. v3.2.1-1067-g285a9ac
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 285a9ac82799578706c1ae80dafa33c8eb2c8619 (commit)
via c482c4a4406028e02b90dd2e40f5291a364aa2bb (commit)
from 4dbd32d02224616177686afd8733a4ad03d0c298 (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=285a9ac82799578706c1ae80dafa33c8eb2c8619
commit 285a9ac82799578706c1ae80dafa33c8eb2c8619
Merge: 4dbd32d c482c4a
Author: Bill Hoffman
AuthorDate: Tue Mar 17 17:05:43 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 17 17:05:43 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
c482c4a4 Pass down the ctest config option to RunCMake tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c482c4a4406028e02b90dd2e40f5291a364aa2bb
commit c482c4a4406028e02b90dd2e40f5291a364aa2bb
Author: Bill Hoffman
AuthorDate: Tue Mar 17 17:04:46 2015 -0400
Commit: Bill Hoffman
CommitDate: Tue Mar 17 17:04:46 2015 -0400
Pass down the ctest config option to RunCMake tests.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index ffda31f..9cd2e9a 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -20,6 +20,7 @@ macro(add_RunCMake_test test)
-DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
+-DRunCMake_CTestTest_CONFIG=${CTestTest_CONFIG}
${${test}_ARGS}
${TEST_ARGS}
-P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 916c7bc..7176e2a 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -16,4 +16,5 @@ set(RunCMake_TEST_OPTIONS -DCMAKE_VERBOSE_MAKEFILE=1)
run_cmake(Build)
unset(RunCMake_TEST_OPTIONS)
run_cmake_command(repeat-until-fail-tests ${CMAKE_CTEST_COMMAND}
+ -C ${RunCMake_CTestTest_CONFIG}
--repeat-until-fail 3 )
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt |1 +
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake |1 +
2 files changed, 2 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1086-gf8c44b8
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 f8c44b8b438059eb936c9c59630aa8f2fc123869 (commit)
via f70529359f56d799e78ceba17b0bf5375ecc4d9b (commit)
via 69dfba4b319ff50c22b9265c5fe52be13dbfcdf7 (commit)
from acfc07a851ee91fed1e29c6e53abd9794991eb72 (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=f8c44b8b438059eb936c9c59630aa8f2fc123869
commit f8c44b8b438059eb936c9c59630aa8f2fc123869
Merge: acfc07a f705293
Author: Bill Hoffman
AuthorDate: Wed Mar 18 13:32:35 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Mar 18 13:32:35 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
f7052935 Pass a configuration to ctest it can be arbitrary since we don't
build.
69dfba4b Revert "Pass down the ctest config option to RunCMake tests."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f70529359f56d799e78ceba17b0bf5375ecc4d9b
commit f70529359f56d799e78ceba17b0bf5375ecc4d9b
Author: Bill Hoffman
AuthorDate: Wed Mar 18 13:31:38 2015 -0400
Commit: Bill Hoffman
CommitDate: Wed Mar 18 13:31:38 2015 -0400
Pass a configuration to ctest it can be arbitrary since we don't build.
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 916c7bc..0e7d6d0 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -16,4 +16,5 @@ set(RunCMake_TEST_OPTIONS -DCMAKE_VERBOSE_MAKEFILE=1)
run_cmake(Build)
unset(RunCMake_TEST_OPTIONS)
run_cmake_command(repeat-until-fail-tests ${CMAKE_CTEST_COMMAND}
+ -C Debug
--repeat-until-fail 3 )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69dfba4b319ff50c22b9265c5fe52be13dbfcdf7
commit 69dfba4b319ff50c22b9265c5fe52be13dbfcdf7
Author: Bill Hoffman
AuthorDate: Wed Mar 18 13:27:49 2015 -0400
Commit: Bill Hoffman
CommitDate: Wed Mar 18 13:27:49 2015 -0400
Revert "Pass down the ctest config option to RunCMake tests."
This reverts commit c482c4a4406028e02b90dd2e40f5291a364aa2bb.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 9cd2e9a..ffda31f 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -20,7 +20,6 @@ macro(add_RunCMake_test test)
-DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
--DRunCMake_CTestTest_CONFIG=${CTestTest_CONFIG}
${${test}_ARGS}
${TEST_ARGS}
-P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 7176e2a..916c7bc 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -16,5 +16,4 @@ set(RunCMake_TEST_OPTIONS -DCMAKE_VERBOSE_MAKEFILE=1)
run_cmake(Build)
unset(RunCMake_TEST_OPTIONS)
run_cmake_command(repeat-until-fail-tests ${CMAKE_CTEST_COMMAND}
- -C ${RunCMake_CTestTest_CONFIG}
--repeat-until-fail 3 )
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt |1 -
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake |2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1226-g8e5b1aa
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 8e5b1aa579c1ec68fd428ef29eecd9723812c3ed (commit)
via a4a1b729c63ec81037af06ac1009d12cc1dc3188 (commit)
from 3aefbb3c78f90c552e4e3c2039302aca3437e959 (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=8e5b1aa579c1ec68fd428ef29eecd9723812c3ed
commit 8e5b1aa579c1ec68fd428ef29eecd9723812c3ed
Merge: 3aefbb3 a4a1b72
Author: Bill Hoffman
AuthorDate: Wed Mar 25 12:39:48 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Mar 25 12:39:48 2015 -0400
Merge topic 'clean-scanbuild-warnings' into next
a4a1b729 Fix warnings from clang scanbuild.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4a1b729c63ec81037af06ac1009d12cc1dc3188
commit a4a1b729c63ec81037af06ac1009d12cc1dc3188
Author: Bill Hoffman
AuthorDate: Wed Mar 25 12:38:37 2015 -0400
Commit: Bill Hoffman
CommitDate: Wed Mar 25 12:38:37 2015 -0400
Fix warnings from clang scanbuild.
diff --git a/Source/CPack/cmCPackDebGenerator.cxx
b/Source/CPack/cmCPackDebGenerator.cxx
index 0a64bd5..87764e1 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -507,6 +507,11 @@ int cmCPackDebGenerator::createDeb()
//int retVal = -1;
res = cmSystemTools::RunSingleCommand(cmd.c_str(), &output,
&retval, toplevel.c_str(), this->GeneratorVerbose, 0);
+ if ( !res || retval )
+{
+cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem running cmake -E md5sum "
+ << cmd << std::endl);
+}
// debian md5sums entries are like this:
// 014f3604694729f3bf19263bac599765 usr/bin/ccmake
// thus strip the full path (with the trailing slash)
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 0026fd7..df61fe6 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1343,16 +1343,21 @@ int cmCTest::RunTest(std::vector argv,
}
*retVal = inst.Run(args, output);
-*output += oss.str();
-if ( log )
+if(output)
+ {
+ *output += oss.str();
+ }
+if ( log && output)
{
*log << *output;
}
cmSystemTools::ChangeDirectory(oldpath);
-
-cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
- "Internal cmCTest object used to run test." << std::endl
- << *output << std::endl);
+if(output)
+ {
+ cmCTestLog(this, HANDLER_VERBOSE_OUTPUT,
+ "Internal cmCTest object used to run test." << std::endl
+ << *output << std::endl);
+ }
return cmsysProcess_State_Exited;
}
@@ -1422,7 +1427,10 @@ int cmCTest::RunTest(std::vector argv,
*retVal = cmsysProcess_GetExitException(cp);
std::string outerr = "\n*** Exception executing: ";
outerr += cmsysProcess_GetExceptionString(cp);
-*output += outerr;
+if(output)
+ {
+ *output += outerr;
+ }
cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, outerr.c_str() << std::endl
<< std::flush);
}
@@ -1430,7 +1438,10 @@ int cmCTest::RunTest(std::vector argv,
{
std::string outerr = "\n*** ERROR executing: ";
outerr += cmsysProcess_GetErrorString(cp);
-*output += outerr;
+if(output)
+ {
+ *output += outerr;
+ }
cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, outerr.c_str() << std::endl
<< std::flush);
}
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index ae9099e..93e3ac4 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3422,6 +3422,7 @@
cmFileCommand::HandleUploadCommand(std::vector const& args)
// enable HTTP ERROR parsing
::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+ check_curl_result(res, "UPLOAD cannot set fail on error flag: ");
// enable uploading
res = ::curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 87f9037..4d7fd60 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -679,7 +679,6 @@ bool cmFindPackageCommand::HandlePackageMode()
if(cmSystemTools::IsOff(def) || !fileFound)
{
fileFound = this->FindConfig();
- def = this->Makefile->GetDefinition(this->Variable);
}
// Sanity check.
@@ -1598,7 +1597,6 @@ bool cmFindPackageCommand::CheckVersion(std::string
const& config_file)
if ((haveResult == fals
[Cmake-commits] CMake branch, next, updated. v3.2.1-1236-g99052a9
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 99052a9ddb3e60dd978a79a17a0b4651219f (commit)
via e680d43d7dd96096962379f627828a182ac0fa80 (commit)
from 2d49fa73f23f4591bd22370ee34340a575d02183 (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=99052a9ddb3e60dd978a79a17a0b4651219f
commit 99052a9ddb3e60dd978a79a17a0b4651219f
Merge: 2d49fa7 e680d43
Author: Bill Hoffman
AuthorDate: Thu Mar 26 11:43:14 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Mar 26 11:43:14 2015 -0400
Merge topic 'clean-scanbuild-warnings' into next
e680d43d Fix an unused variable warning from scanbuild.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e680d43d7dd96096962379f627828a182ac0fa80
commit e680d43d7dd96096962379f627828a182ac0fa80
Author: Bill Hoffman
AuthorDate: Thu Mar 26 11:05:56 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Mar 26 11:05:56 2015 -0400
Fix an unused variable warning from scanbuild.
diff --git a/Source/cmSetTestsPropertiesCommand.cxx
b/Source/cmSetTestsPropertiesCommand.cxx
index d079a19..e9cfacc 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -26,14 +26,12 @@ bool cmSetTestsPropertiesCommand
// first collect up the list of files
std::vector propertyPairs;
- bool doingFiles = true;
int numFiles = 0;
std::vector::const_iterator j;
for(j= args.begin(); j != args.end();++j)
{
if(*j == "PROPERTIES")
{
- doingFiles = false;
// now loop through the rest of the arguments, new style
++j;
if (std::distance(j, args.end()) % 2 != 0)
@@ -44,15 +42,9 @@ bool cmSetTestsPropertiesCommand
propertyPairs.insert(propertyPairs.end(), j, args.end());
break;
}
-else if (doingFiles)
- {
- numFiles++;
- }
else
{
- this->SetError("called with illegal arguments, maybe "
- "missing a PROPERTIES specifier?");
- return false;
+ numFiles++;
}
}
if(propertyPairs.empty())
@@ -62,7 +54,6 @@ bool cmSetTestsPropertiesCommand
return false;
}
-
// now loop over all the targets
int i;
for(i = 0; i < numFiles; ++i)
---
Summary of changes:
Source/cmSetTestsPropertiesCommand.cxx | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1291-g1d001d0
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 1d001d0d25b0445bb8a78e8b0f5671f201229a2c (commit) via d9420364a2c38434ac5864c0ca209d9c32f904df (commit) from bab6126b2210146bbe068bd245b9d84044d3200d (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=1d001d0d25b0445bb8a78e8b0f5671f201229a2c commit 1d001d0d25b0445bb8a78e8b0f5671f201229a2c Merge: bab6126 d942036 Author: Bill Hoffman AuthorDate: Mon Mar 30 16:10:36 2015 -0400 Commit: CMake Topic Stage CommitDate: Mon Mar 30 16:10:36 2015 -0400 Merge topic 'clean-scanbuild-warnings' into next d9420364 Move scanbuild exceptions out of dashboard script and into cmake. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9420364a2c38434ac5864c0ca209d9c32f904df commit d9420364a2c38434ac5864c0ca209d9c32f904df Author: Bill Hoffman AuthorDate: Mon Mar 30 16:08:54 2015 -0400 Commit: Bill Hoffman CommitDate: Mon Mar 30 16:08:54 2015 -0400 Move scanbuild exceptions out of dashboard script and into cmake. diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index f499be1..8c4d400 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -62,6 +62,18 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION # Ignore clang's summary warning, assuming prior text has matched some # other warning expression: "[0-9,]+ warnings? generated." + +# scanbuild exceptions + "char_traits.h:.*: warning: Null pointer argument in call to string length function" + "stl_construct.h:.*: warning: Forming reference to null pointer" + ".*stl_uninitialized.h:75:19: warning: Forming reference to null pointer.*" + ".*stl_vector.h:.*: warning: Returning null reference.*" + "warning: Value stored to 'yymsg' is never read" + "warning: Value stored to 'yytoken' is never read" + "index_encoder.c.241.2. warning: Value stored to .out_start. is never read" + "index.c.*warning: Access to field.*results in a dereference of a null pointer.*loaded from variable.*" + "cm_sha2.*warning: Value stored to.*is never read" + "testProcess.*warning: Dereference of null pointer .loaded from variable .invalidAddress.." ) if(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode") --- Summary of changes: CTestCustom.cmake.in | 12 1 file changed, 12 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.1-1331-g0740c79
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 0740c7982f8f91f97223e6167d975eb488df2fc2 (commit)
via 4c693cebe35c199d8fba8ce49b3a8bfec441bfe9 (commit)
from 3720acd7bfebe5f6ab4221162e6d1dae4eb6d19a (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=0740c7982f8f91f97223e6167d975eb488df2fc2
commit 0740c7982f8f91f97223e6167d975eb488df2fc2
Merge: 3720acd 4c693ce
Author: Bill Hoffman
AuthorDate: Tue Mar 31 15:05:14 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Mar 31 15:05:14 2015 -0400
Merge topic 'test_cpack_symlinks' into next
4c693ceb Add a test case for CPack with symbolic links in the source tree.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c693cebe35c199d8fba8ce49b3a8bfec441bfe9
commit 4c693cebe35c199d8fba8ce49b3a8bfec441bfe9
Author: Bill Hoffman
AuthorDate: Tue Mar 31 15:04:39 2015 -0400
Commit: Bill Hoffman
CommitDate: Tue Mar 31 15:04:39 2015 -0400
Add a test case for CPack with symbolic links in the source tree.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 7b9c810..1242332 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -203,6 +203,11 @@ add_RunCMake_test(install)
add_RunCMake_test(CPackInstallProperties)
add_RunCMake_test(ExternalProject)
add_RunCMake_test(CTestCommandLine)
+# Only run this test on unix platforms that support
+# symbolic links
+if(UNIX)
+ add_RunCMake_test(CPackSymlinks)
+endif()
set(IfacePaths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
add_RunCMake_test(IfacePaths_INCLUDE_DIRECTORIES TEST_DIR IfacePaths)
diff --git a/Tests/RunCMake/CPackSymlinks/CMakeLists.txt
b/Tests/RunCMake/CPackSymlinks/CMakeLists.txt
new file mode 100644
index 000..dbaa24c
--- /dev/null
+++ b/Tests/RunCMake/CPackSymlinks/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
+
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
b/Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
new file mode 100644
index 000..845c377
--- /dev/null
+++ b/Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
@@ -0,0 +1 @@
+include(CPack)
diff --git a/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
b/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
new file mode 100644
index 000..3431eae
--- /dev/null
+++ b/Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
@@ -0,0 +1,21 @@
+include(RunCMake)
+
+function(run_cpack_symlink_test TEST_NAME)
+ set(RunCMake_TEST_NO_CLEAN TRUE)
+ set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-build")
+ set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/${TEST_NAME}-source")
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+ file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}")
+ execute_process(
+COMMAND "${CMAKE_COMMAND}" -E tar xvf
+ "${RunCMake_SOURCE_DIR}/testcpacksym.tar"
+WORKING_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}"
+)
+ run_cmake(${TEST_NAME})
+ run_cmake_command(${TEST_NAME} ${CMAKE_CPACK_COMMAND}
+ --config CPackSourceConfig.cmake)
+endfunction()
+
+run_cpack_symlink_test(CPack_TestSymlinks)
diff --git a/Tests/RunCMake/CPackSymlinks/testcpacksym.tar
b/Tests/RunCMake/CPackSymlinks/testcpacksym.tar
new file mode 100644
index 000..6e5017e
Binary files /dev/null and b/Tests/RunCMake/CPackSymlinks/testcpacksym.tar
differ
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt |5 +
.../{CPackRPM => CPackSymlinks}/CMakeLists.txt |3 ---
.../CPackSymlinks/CPack_TestSymlinks.cmake |1 +
Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake| 21
.../RunCMake/CPackSymlinks/testcpacksym.tar| Bin 12292 -> 10240 bytes
5 files changed, 27 insertions(+), 3 deletions(-)
copy Tests/RunCMake/{CPackRPM => CPackSymlinks}/CMakeLists.txt (72%)
create mode 100644 Tests/RunCMake/CPackSymlinks/CPack_TestSymlinks.cmake
create mode 100644 Tests/RunCMake/CPackSymlinks/RunCMakeTest.cmake
copy Modules/CPack.DS_Store.in =>
Tests/RunCMake/CPackSymlinks/testcpacksym.tar (64%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.2-2699-g13e8682
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 13e86829073482237617637c644b073a6f3300c5 (commit)
via 69a600d4d9adc582523acf5c83abbb989461 (commit)
from 4283712685e5e31ff05db587ea7cfcfdc203f447 (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=13e86829073482237617637c644b073a6f3300c5
commit 13e86829073482237617637c644b073a6f3300c5
Merge: 4283712 69a600d
Author: Bill Hoffman
AuthorDate: Tue May 12 17:05:03 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue May 12 17:05:03 2015 -0400
Merge topic 'add-iwyu-support' into next
69a600d4 add support for include what you use (iwyu) to CMake/CTest.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69a600d4d9adc582523acf5c83abbb989461
commit 69a600d4d9adc582523acf5c83abbb989461
Author: Bill Hoffman
AuthorDate: Tue May 12 16:37:11 2015 -0400
Commit: Bill Hoffman
CommitDate: Tue May 12 16:37:11 2015 -0400
add support for include what you use (iwyu) to CMake/CTest.
This commit adds a cmake -E command to run iwyu in place of a compiler
for the compile line, then it then runs the compiler. This is inserted
into the COMPILE_CXX_OBJECT command if CMAKE_IWYU_EXECUTABLE is set
in the project. This allows for a complete build to be done since iwyu
can not actually build files. The output from iwyu is treated as a warning
by ctest and will show up nicely on CDash when ctest launchers are used.
diff --git a/Modules/CMakeCXXInformation.cmake
b/Modules/CMakeCXXInformation.cmake
index 72b2857..c186eeb 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -280,6 +280,14 @@ if(NOT CMAKE_CXX_COMPILE_OBJECT)
set(CMAKE_CXX_COMPILE_OBJECT
"-o -c ")
endif()
+# check to see if CMAKE_IWYU_EXECUTABLE is set. If yes,
+# then use the cmake -E __run_iwyu command to run iwyu
+# as well as the clang compiler for building cxx files.
+if(CMAKE_IWYU_EXECUTABLE)
+ set(CMAKE_CXX_COMPILE_OBJECT
+" -E __run_iwyu --iwyu=${CMAKE_IWYU_EXECUTABLE} --
${CMAKE_CXX_COMPILE_OBJECT}")
+endif()
+
if(NOT CMAKE_CXX_LINK_EXECUTABLE)
set(CMAKE_CXX_LINK_EXECUTABLE
diff --git a/Source/CTest/cmCTestBuildHandler.cxx
b/Source/CTest/cmCTestBuildHandler.cxx
index 29e07ef..98dfcfa 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -133,6 +133,8 @@ static const char* cmCTestWarningMatches[] = {
"cc-[0-9]* CC: REMARK File = .*, Line = [0-9]*",
"^CMake Warning.*:",
"^\\[WARNING\\]",
+ ".*should remove these lines:",
+ ".*should add these lines:",
0
};
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index de6ecde..bf271e9 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -649,7 +649,9 @@ void cmCTestLaunch::LoadScrapeRules()
this->RegexWarning.push_back("(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]");
this->RegexWarning.push_back("(^|[ :])[Rr][Ee][Mm][Aa][Rr][Kk]");
this->RegexWarning.push_back("(^|[ :])[Nn][Oo][Tt][Ee]");
-
+ // add warning expressions for include-what-you-use output
+ this->RegexWarning.push_back(".*should remove these lines:");
+ this->RegexWarning.push_back(".*should add these lines:");
// Load custom match rules given to us by CTest.
this->LoadScrapeRules("Warning", this->RegexWarning);
this->LoadScrapeRules("WarningSuppress", this->RegexWarningSuppress);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 12bb8ee..79177fb 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -210,6 +210,57 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
}
return 0;
}
+// run include what you use command and then run the compile
+// command. This is an internal undocumented option and should
+// only be used by CMake itself when running iwyu.
+else if (args[1] == "__run_iwyu")
+ {
+ if(args.size() < 3)
+{
+std::cerr << "__run_iwyu Usage: -E __run_iwyu [--iwyu=/path/iwyu]"
+ " -- compile command\n";
+return 1;
+}
+ bool doing_options = true;
+ std::vector orig_cmd;
+ std::string cmd;
+ for (std::string::size_type cc = 2; cc < args.size(); cc ++)
+{
+std::string const& arg = args[cc];
+if(arg == "--")
+ {
+
[Cmake-commits] CMake branch, next, updated. v3.2.2-2727-g00d5f20
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 00d5f20395866c70ed04842685290554d97daf64 (commit)
via 7699ce070dfdaad748f6274cd3c03efe96951c64 (commit)
from cb96996cfef31f71e2a9443897369cdeab79728c (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=00d5f20395866c70ed04842685290554d97daf64
commit 00d5f20395866c70ed04842685290554d97daf64
Merge: cb96996 7699ce0
Author: Bill Hoffman
AuthorDate: Thu May 14 13:35:20 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu May 14 13:35:20 2015 -0400
Merge topic 'add-iwyu-support' into next
7699ce07 Check that iwyu and compiler commands are able to run, and capture
stderr.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7699ce070dfdaad748f6274cd3c03efe96951c64
commit 7699ce070dfdaad748f6274cd3c03efe96951c64
Author: Bill Hoffman
AuthorDate: Thu May 14 13:31:32 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu May 14 13:31:32 2015 -0400
Check that iwyu and compiler commands are able to run, and capture stderr.
Remove iwyu match expression from cmCTestLaunch and have the -E command
that runs iwyu add Warning to the output so that it is recognized as a
warning.
diff --git a/Modules/CMakeCXXInformation.cmake
b/Modules/CMakeCXXInformation.cmake
index c186eeb..dcdfc48 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -285,7 +285,7 @@ endif()
# as well as the clang compiler for building cxx files.
if(CMAKE_IWYU_EXECUTABLE)
set(CMAKE_CXX_COMPILE_OBJECT
-" -E __run_iwyu --iwyu=${CMAKE_IWYU_EXECUTABLE} --
${CMAKE_CXX_COMPILE_OBJECT}")
+" -E __run_iwyu --iwyu=\"${CMAKE_IWYU_EXECUTABLE}\" --
${CMAKE_CXX_COMPILE_OBJECT}")
endif()
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index bf271e9..ca39f19 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -649,9 +649,6 @@ void cmCTestLaunch::LoadScrapeRules()
this->RegexWarning.push_back("(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]");
this->RegexWarning.push_back("(^|[ :])[Rr][Ee][Mm][Aa][Rr][Kk]");
this->RegexWarning.push_back("(^|[ :])[Nn][Oo][Tt][Ee]");
- // add warning expressions for include-what-you-use output
- this->RegexWarning.push_back(".*should remove these lines:");
- this->RegexWarning.push_back(".*should add these lines:");
// Load custom match rules given to us by CTest.
this->LoadScrapeRules("Warning", this->RegexWarning);
this->LoadScrapeRules("WarningSuppress", this->RegexWarningSuppress);
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 79177fb..979e935 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -240,12 +240,12 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
orig_cmd.push_back(arg);
}
}
- if(cmd.size() == 0)
+ if(cmd.empty())
{
std::cerr << "__run_iwyu missing iwyu path --iwyu=/path/to/iwyu\n";
return 1;
}
- if(orig_cmd.size() == 0)
+ if(orig_cmd.empty())
{
std::cerr << "__run_iwyu missing compile command after --\n";
return 1;
@@ -253,11 +253,32 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
std::vector iwyucmd = orig_cmd;
iwyucmd[0] = cmd;
int ret = 0;
- cmSystemTools::RunSingleCommand(iwyucmd, 0, 0, 0,
- 0, cmSystemTools::OUTPUT_PASSTHROUGH);
+ std::string stdErr;
+ if(!cmSystemTools::RunSingleCommand(iwyucmd, 0, &stdErr, &ret,
+ 0, cmSystemTools::OUTPUT_NONE))
+{
+// if the command fails to run then output the command and
+// the stderr from RunSingleCommand and return 1
+std::cerr << "Error running: " << cmd << "\n";
+std::cerr << stdErr << "\n";
+return 1;
+}
+ if(stdErr.find("should remove these lines:") != stdErr.npos
+|| stdErr.find("should add these lines:") != stdErr.npos)
+{
+std::cerr << ":Warning include what you use output: " << stdErr
+ << "\n";
+}
+ // capture stderr, look for strings
+ // output Warning iwyu output:\n make sure matches regex
// the return value of iwyu is ignored as it is always fail
-
[Cmake-commits] CMake branch, next, updated. v3.2.2-2753-g0dfd6b2
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 0dfd6b239219e5ead41749de958743ff1f49353b (commit)
via 2a21dde89029b34ec46d7f2abdb74310042f7c5a (commit)
from 6b5cb9289b4d9d5918159a53c870ea9f84cc9e02 (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=0dfd6b239219e5ead41749de958743ff1f49353b
commit 0dfd6b239219e5ead41749de958743ff1f49353b
Merge: 6b5cb92 2a21dde
Author: Bill Hoffman
AuthorDate: Thu May 14 18:43:49 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu May 14 18:43:49 2015 -0400
Merge topic 'add-iwyu-support' into next
2a21dde8 Change CMAKE_IWYU_EXECUTABLE to CMAKE_IWYU_COMMAND so args can be
passed.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a21dde89029b34ec46d7f2abdb74310042f7c5a
commit 2a21dde89029b34ec46d7f2abdb74310042f7c5a
Author: Bill Hoffman
AuthorDate: Thu May 14 18:41:32 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu May 14 18:41:32 2015 -0400
Change CMAKE_IWYU_EXECUTABLE to CMAKE_IWYU_COMMAND so args can be passed.
iwyu is a bit on the broken side, and sometimes requires extra arguments
to run correctly. This change allows for CMAKE_IWYU_COMMAND to be a
semi-colon separated list that is the command line to run iwyu.
diff --git a/Modules/CMakeCXXInformation.cmake
b/Modules/CMakeCXXInformation.cmake
index dcdfc48..32b1e3c 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -283,9 +283,9 @@ endif()
# check to see if CMAKE_IWYU_EXECUTABLE is set. If yes,
# then use the cmake -E __run_iwyu command to run iwyu
# as well as the clang compiler for building cxx files.
-if(CMAKE_IWYU_EXECUTABLE)
+if(CMAKE_IWYU_COMMAND)
set(CMAKE_CXX_COMPILE_OBJECT
-" -E __run_iwyu --iwyu=\"${CMAKE_IWYU_EXECUTABLE}\" --
${CMAKE_CXX_COMPILE_OBJECT}")
+" -E __run_iwyu --iwyu=\"${CMAKE_IWYU_COMMAND}\" --
${CMAKE_CXX_COMPILE_OBJECT}")
endif()
diff --git a/Source/CTest/cmCTestBuildHandler.cxx
b/Source/CTest/cmCTestBuildHandler.cxx
index 98dfcfa..29e07ef 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -133,8 +133,6 @@ static const char* cmCTestWarningMatches[] = {
"cc-[0-9]* CC: REMARK File = .*, Line = [0-9]*",
"^CMake Warning.*:",
"^\\[WARNING\\]",
- ".*should remove these lines:",
- ".*should add these lines:",
0
};
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 979e935..0683a3f 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -250,8 +250,14 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
std::cerr << "__run_iwyu missing compile command after --\n";
return 1;
}
- std::vector iwyucmd = orig_cmd;
- iwyucmd[0] = cmd;
+ std::vector iwyucmd;
+ cmSystemTools::ExpandListArgument(cmd, iwyucmd);
+ // put the rest of orig_cmd without the compiler orig_cmd[0]
+ // into the iwyucmd
+ for(std::vector::size_type i=1; i < orig_cmd.size(); ++i)
+{
+iwyucmd.push_back(orig_cmd[i]);
+}
int ret = 0;
std::string stdErr;
if(!cmSystemTools::RunSingleCommand(iwyucmd, 0, &stdErr, &ret,
@@ -266,7 +272,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
if(stdErr.find("should remove these lines:") != stdErr.npos
|| stdErr.find("should add these lines:") != stdErr.npos)
{
-std::cerr << ":Warning include what you use output: " << stdErr
+std::cerr << "Warning : include what you use output: " << stdErr
<< "\n";
}
// capture stderr, look for strings
---
Summary of changes:
Modules/CMakeCXXInformation.cmake|4 ++--
Source/CTest/cmCTestBuildHandler.cxx |2 --
Source/cmcmd.cxx | 12 +---
3 files changed, 11 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.3-1499-g37a62d1
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 37a62d1369d416386f17c4d45b68dcf8806d755a (commit)
via e3df38c4525346736a3bd509bed3dd0efc187b76 (commit)
from c27ccf3f4bf1ff5c0460a04e5eb922aaefcca102 (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=37a62d1369d416386f17c4d45b68dcf8806d755a
commit 37a62d1369d416386f17c4d45b68dcf8806d755a
Merge: c27ccf3 e3df38c
Author: Bill Hoffman
AuthorDate: Thu Jun 4 16:57:45 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 4 16:57:45 2015 -0400
Merge topic 'compiler-launcher' into next
e3df38c4 Add the ability to insert a compiler launching tool like ccache or
distcc.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3df38c4525346736a3bd509bed3dd0efc187b76
commit e3df38c4525346736a3bd509bed3dd0efc187b76
Author: Bill Hoffman
AuthorDate: Thu Jun 4 15:56:56 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Jun 4 15:56:56 2015 -0400
Add the ability to insert a compiler launching tool like ccache or distcc.
This commit creates an ability to run tools like ccache or distcc by setting
a _COMPILER_LAUNCHER property. This would replace the current
practice
of using COMPILER_ARG1.
diff --git a/Help/manual/cmake-properties.7.rst
b/Help/manual/cmake-properties.7.rst
index 615254e..9a60a10 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -177,6 +177,7 @@ Properties on Targets
/prop_tgt/JOB_POOL_COMPILE
/prop_tgt/JOB_POOL_LINK
/prop_tgt/LABELS
+ /prop_tgt/LANG_COMPILER_LAUNCHER
/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE
/prop_tgt/LANG_VISIBILITY_PRESET
/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index bd02f8b..2b92006 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -235,6 +235,7 @@ Variables that Control the Build
/variable/CMAKE_INSTALL_NAME_DIR
/variable/CMAKE_INSTALL_RPATH
/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH
+ /variable/CMAKE_LANG_COMPILER_LAUNCHER
/variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE
/variable/CMAKE_LANG_VISIBILITY_PRESET
/variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY
diff --git a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
new file mode 100644
index 000..8fbc852
--- /dev/null
+++ b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
@@ -0,0 +1,13 @@
+_COMPILER_LAUNCHER
+---
+
+This property is implemented only when is ``C`` or ``CXX``.
+
+Specify a string containing a command line for a compiler launching tool.
+The :ref:`Makefile Generators` and the :generator:`Ninja` generator will
+run this tool and pass the compiler and its arguments to the tool. Some
+example tools are distcc and ccache.
+
+This property is initialized by the value of
+the :variable:`CMAKE__COMPILER_LAUNCER` variable if it is set
+when a target is created.
diff --git a/Help/release/dev/compiler-launcher.rst
b/Help/release/dev/compiler-launcher.rst
new file mode 100644
index 000..90991e5
--- /dev/null
+++ b/Help/release/dev/compiler-launcher.rst
@@ -0,0 +1,8 @@
+compiler-launcher
+--
+
+* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
+ learned to add compiler launcher tools like distcc and ccache along with the
+ compiler for ``C`` and ``CXX`` languages. See the
+ :variable:`CMAKE__COMPILER_LAUNCHER` variable and
+ :prop_tgt:`_COMPILER_LAUNCHER` target property for details.
diff --git a/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
b/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
new file mode 100644
index 000..808422d
--- /dev/null
+++ b/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
@@ -0,0 +1,6 @@
+CMAKE__COMPILER_LAUNCHER
+-
+
+Default value for :prop_tgt:`_COMPILER_LAUNCHER` target property.
+This variable is used to initialize the property on each target as it is
+created. This is done only when is ``C`` or ``CXX``.
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index 7b88bc7..6c630a5 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -775,6 +775,26 @@ cmMakefileTargetGenerator
}
}
+ // Maybe insert a compiler launcher like ccache or distcc
+ if (!compileCommands.empty() && (lang == "C" || lang == "CXX"))
+{
+std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER";
+const char *clau
[Cmake-commits] CMake branch, next, updated. v3.2.3-1512-g82e0301
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 82e0301fc55157c88ffa10c5800e426d5b7348f4 (commit) via 3c43441cb4df12b9f07414f3b51c31adf15bf14e (commit) from 022ec2434d23adc7e0a3bae74306d64649ac8a96 (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=82e0301fc55157c88ffa10c5800e426d5b7348f4 commit 82e0301fc55157c88ffa10c5800e426d5b7348f4 Merge: 022ec24 3c43441 Author: Bill Hoffman AuthorDate: Thu Jun 4 17:18:30 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 4 17:18:30 2015 -0400 Merge topic 'compiler-launcher' into next 3c43441c Fix spelling error of variable name. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c43441cb4df12b9f07414f3b51c31adf15bf14e commit 3c43441cb4df12b9f07414f3b51c31adf15bf14e Author: Bill Hoffman AuthorDate: Thu Jun 4 17:17:37 2015 -0400 Commit: Bill Hoffman CommitDate: Thu Jun 4 17:17:37 2015 -0400 Fix spelling error of variable name. diff --git a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst index 8fbc852..9a16687 100644 --- a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst +++ b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst @@ -9,5 +9,5 @@ run this tool and pass the compiler and its arguments to the tool. Some example tools are distcc and ccache. This property is initialized by the value of -the :variable:`CMAKE__COMPILER_LAUNCER` variable if it is set +the :variable:`CMAKE__COMPILER_LAUNCHER` variable if it is set when a target is created. --- Summary of changes: Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.2.3-1514-g581b046
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 581b046dcfc911310c1f211254b794d7569625a4 (commit) via d82e2f2329b71885389efa3d93d4135f63382158 (commit) from 82e0301fc55157c88ffa10c5800e426d5b7348f4 (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=581b046dcfc911310c1f211254b794d7569625a4 commit 581b046dcfc911310c1f211254b794d7569625a4 Merge: 82e0301 d82e2f2 Author: Bill Hoffman AuthorDate: Thu Jun 4 17:44:45 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 4 17:44:45 2015 -0400 Merge topic 'compiler-launcher' into next d82e2f23 Fix documentation warning. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d82e2f2329b71885389efa3d93d4135f63382158 commit d82e2f2329b71885389efa3d93d4135f63382158 Author: Bill Hoffman AuthorDate: Thu Jun 4 17:44:18 2015 -0400 Commit: Bill Hoffman CommitDate: Thu Jun 4 17:44:18 2015 -0400 Fix documentation warning. diff --git a/Help/release/dev/compiler-launcher.rst b/Help/release/dev/compiler-launcher.rst index 90991e5..3ba692d 100644 --- a/Help/release/dev/compiler-launcher.rst +++ b/Help/release/dev/compiler-launcher.rst @@ -1,5 +1,5 @@ compiler-launcher --- +- * The :ref:`Makefile Generators` and the :generator:`Ninja` generator learned to add compiler launcher tools like distcc and ccache along with the --- Summary of changes: Help/release/dev/compiler-launcher.rst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-360-g6ad4ea7
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 6ad4ea7baa433296f82133898e6eaf45bd6cd08f (commit)
via 1e3b22f6d1379a14406a3a3a89c504a7bca2a863 (commit)
from c94dec14b30fcff16c91df0102ef96299e0ab147 (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=6ad4ea7baa433296f82133898e6eaf45bd6cd08f
commit 6ad4ea7baa433296f82133898e6eaf45bd6cd08f
Merge: c94dec1 1e3b22f
Author: Bill Hoffman
AuthorDate: Tue Jun 9 13:33:22 2015 -0400
Commit: CMake Topic Stage
CommitDate: Tue Jun 9 13:33:22 2015 -0400
Merge topic 'compiler-launcher' into next
1e3b22f6 Change launcher to use cmake ; lists to specifiy the launcher
command.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e3b22f6d1379a14406a3a3a89c504a7bca2a863
commit 1e3b22f6d1379a14406a3a3a89c504a7bca2a863
Author: Bill Hoffman
AuthorDate: Tue Jun 9 13:32:20 2015 -0400
Commit: Bill Hoffman
CommitDate: Tue Jun 9 13:32:20 2015 -0400
Change launcher to use cmake ; lists to specifiy the launcher command.
diff --git a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
index 9a16687..3a59497 100644
--- a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
+++ b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
@@ -1,9 +1,9 @@
_COMPILER_LAUNCHER
+
This property is implemented only when is ``C`` or ``CXX``.
-Specify a string containing a command line for a compiler launching tool.
+Specify a :ref:`;-list containing a command line for a compiler launching tool.
The :ref:`Makefile Generators` and the :generator:`Ninja` generator will
run this tool and pass the compiler and its arguments to the tool. Some
example tools are distcc and ccache.
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index 6c630a5..f820b74 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -782,14 +782,16 @@ cmMakefileTargetGenerator
const char *clauncher = this->Target->GetProperty(clauncher_prop);
if (clauncher && *clauncher)
{
- // handle the case where launcher has its own arguments inside
- // the variable handling spaces in the path, etc.
- std::string cmd, args;
- cmSystemTools::SplitProgramFromArgs(clauncher,
- cmd, args);
+ std::vector launcher_cmd;
+ cmSystemTools::ExpandListArgument(clauncher, launcher_cmd, true);
std::string run_launcher =
-this->LocalGenerator->EscapeForShell(cmd);
- run_launcher += args;
+this->LocalGenerator->EscapeForShell(launcher_cmd[0]);
+ // now put any arguments in if they exist
+ for(size_t i =1; i < launcher_cmd.size(); ++i)
+{
+run_launcher += " ";
+run_launcher += launcher_cmd[i];
+}
run_launcher += " ";
compileCommands.front().insert(0, run_launcher);
}
diff --git a/Source/cmNinjaTargetGenerator.cxx
b/Source/cmNinjaTargetGenerator.cxx
index 3e3c9cd..095e1f7 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -482,14 +482,16 @@ cmNinjaTargetGenerator
const char *clauncher = this->Target->GetProperty(clauncher_prop);
if (clauncher && *clauncher)
{
- // handle the case where launcher has its own arguments inside
- // the variable handling spaces in the path, etc.
- std::string cmd, args;
- cmSystemTools::SplitProgramFromArgs(clauncher,
- cmd, args);
+ std::vector launcher_cmd;
+ cmSystemTools::ExpandListArgument(clauncher, launcher_cmd, true);
std::string run_launcher =
-this->LocalGenerator->EscapeForShell(cmd);
- run_launcher += args;
+this->LocalGenerator->EscapeForShell(launcher_cmd[0]);
+ // now put any arguments in if they exist
+ for(size_t i =1; i < launcher_cmd.size(); ++i)
+{
+run_launcher += " ";
+run_launcher += launcher_cmd[i];
+}
run_launcher += " ";
compileCmds.front().insert(0, run_launcher);
}
@@ -507,7 +509,6 @@ cmNinjaTargetGenerator
std::string cmdLine =
this->GetLocalGenerator()->BuildCommandLine(compileCmds);
-
// Write the rule for compiling file of the given language.
std::ostringstream comment;
comment << "Rule for compiling " << lang << " files.";
diff --gi
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-362-g61bf98d
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 61bf98d1fa5b00a1769cf6dfa7ef2bc4723f0004 (commit) via 29ac20ebcffb58b610b6713fff6b9ea475a86842 (commit) from 6ad4ea7baa433296f82133898e6eaf45bd6cd08f (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=61bf98d1fa5b00a1769cf6dfa7ef2bc4723f0004 commit 61bf98d1fa5b00a1769cf6dfa7ef2bc4723f0004 Merge: 6ad4ea7 29ac20e Author: Bill Hoffman AuthorDate: Tue Jun 9 13:51:23 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Jun 9 13:51:23 2015 -0400 Merge topic 'compiler-launcher' into next 29ac20eb Fix reference to cmake list. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29ac20ebcffb58b610b6713fff6b9ea475a86842 commit 29ac20ebcffb58b610b6713fff6b9ea475a86842 Author: Bill Hoffman AuthorDate: Tue Jun 9 13:50:57 2015 -0400 Commit: Bill Hoffman CommitDate: Tue Jun 9 13:50:57 2015 -0400 Fix reference to cmake list. diff --git a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst index 3a59497..0fe0b31 100644 --- a/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst +++ b/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst @@ -3,10 +3,10 @@ This property is implemented only when is ``C`` or ``CXX``. -Specify a :ref:`;-list containing a command line for a compiler launching tool. -The :ref:`Makefile Generators` and the :generator:`Ninja` generator will -run this tool and pass the compiler and its arguments to the tool. Some -example tools are distcc and ccache. +Specify a :ref:`;-list ` containing a command line +for a compiler launching tool. The :ref:`Makefile Generators` and the +:generator:`Ninja` generator will run this tool and pass the compiler and +its arguments to the tool. Some example tools are distcc and ccache. This property is initialized by the value of the :variable:`CMAKE__COMPILER_LAUNCHER` variable if it is set --- Summary of changes: Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst |8 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-449-g0753c59
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 0753c59f4551e65b9f6d422def093f55da338ad9 (commit)
via 3dfe9c05dfd7eb52e3ff6dc8da0d258070bb5fbd (commit)
via 03e22481886c6ea97440f54ef84df84969e5969f (commit)
from 870d4341f25524a1c58a25e2289f8c00ed584845 (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=0753c59f4551e65b9f6d422def093f55da338ad9
commit 0753c59f4551e65b9f6d422def093f55da338ad9
Merge: 870d434 3dfe9c0
Author: Bill Hoffman
AuthorDate: Fri Jun 12 14:24:37 2015 -0400
Commit: CMake Topic Stage
CommitDate: Fri Jun 12 14:24:37 2015 -0400
Merge topic 'fix_cuda_for_ccache' into next
3dfe9c05 Fix FindCUDA to only realpath the host compiler if it is clang
linked to cc.
03e22481 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dfe9c05dfd7eb52e3ff6dc8da0d258070bb5fbd
commit 3dfe9c05dfd7eb52e3ff6dc8da0d258070bb5fbd
Author: Bill Hoffman
AuthorDate: Fri Jun 12 14:16:09 2015 -0400
Commit: Bill Hoffman
CommitDate: Fri Jun 12 14:16:09 2015 -0400
Fix FindCUDA to only realpath the host compiler if it is clang linked to cc.
This fixes ccache on all other platforms. CUDA with ccache failed because
it followed the symlink for ccache to cc and tried to use ccache directly
as a compiler.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index e8e1fb1..f4b0783 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -468,17 +468,31 @@ set(CUDA_NVCC_FLAGS "" CACHE STRING "Semi-colon delimit
multiple arguments.")
if(CMAKE_GENERATOR MATCHES "Visual Studio")
set(CUDA_HOST_COMPILER "$(VCInstallDir)bin" CACHE FILEPATH "Host side
compiler used by NVCC")
else()
- # Using cc which is symlink to clang may let NVCC think it is GCC and issue
- # unhandled -dumpspecs option to clang. Also in case neither
- # CMAKE_C_COMPILER is defined (project does not use C language) nor
- # CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let
- # nvcc use its own default C compiler.
- if(DEFINED CMAKE_C_COMPILER AND NOT DEFINED CUDA_HOST_COMPILER)
-get_filename_component(c_compiler_realpath "${CMAKE_C_COMPILER}" REALPATH)
+ if(APPLE
+ AND "${CMAKE_C_COMPILER_ID}" MATCHES "Clang"
+ AND "${CMAKE_C_COMPILER}" MATCHES "/cc$")
+# Using cc which is symlink to clang may let NVCC think it is GCC and issue
+# unhandled -dumpspecs option to clang. Also in case neither
+# CMAKE_C_COMPILER is defined (project does not use C language) nor
+# CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let
+# nvcc use its own default C compiler.
+# Only care about this on APPLE with clang to avoid
+# following symlinks to things like ccache
+if(DEFINED CMAKE_C_COMPILER AND NOT DEFINED CUDA_HOST_COMPILER)
+ get_filename_component(c_compiler_realpath "${CMAKE_C_COMPILER}"
REALPATH)
+ # if the real path does not end up being clang then
+ # go back to using CMAKE_C_COMPILER
+ if(NOT "${c_compiler_realpath}" MATCHES "/clang$")
+set(c_compiler_realpath "${CMAKE_C_COMPILER}")
+ endif()
+else()
+ set(c_compiler_realpath "")
+endif()
+set(CUDA_HOST_COMPILER "${c_compiler_realpath}" CACHE FILEPATH "Host side
compiler used by NVCC")
else()
-set(c_compiler_realpath "")
+set(CUDA_HOST_COMPILER "${CMAKE_C_COMPILER}"
+ CACHE FILEPATH "Host side compiler used by NVCC")
endif()
- set(CUDA_HOST_COMPILER "${c_compiler_realpath}" CACHE FILEPATH "Host side
compiler used by NVCC")
endif()
# Propagate the host flags to the host compiler via -Xcompiler
---
Summary of changes:
Modules/FindCUDA.cmake| 32 +++-
Source/CMakeVersion.cmake |2 +-
2 files changed, 24 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-674-g1a99eb7
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 1a99eb71ed71060d4152fd4deca7edffee197d61 (commit) via 3787c8703cdf5ac481b3d4aaa8dedc5d5ac9790c (commit) from ac81846d83a3fffc007ef6043b004bbb7a244a1f (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=1a99eb71ed71060d4152fd4deca7edffee197d61 commit 1a99eb71ed71060d4152fd4deca7edffee197d61 Merge: ac81846 3787c87 Author: Bill Hoffman AuthorDate: Thu Jun 25 14:29:26 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 25 14:29:26 2015 -0400 Merge topic 'auto_export_dll_symbols' into next 3787c870 This commit introduces the ability to export all symbols in a Windows dll. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3787c8703cdf5ac481b3d4aaa8dedc5d5ac9790c commit 3787c8703cdf5ac481b3d4aaa8dedc5d5ac9790c Author: Bill Hoffman AuthorDate: Fri Jun 19 16:12:43 2015 -0400 Commit: Bill Hoffman CommitDate: Thu Jun 25 14:26:54 2015 -0400 This commit introduces the ability to export all symbols in a Windows dll. This creates the target property WINDOWS_EXPORT_ALL_SYMBOLS which when on will export all symbols in a dll. This is done by extracting the symbols from the object files prior to linking the dll. diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 9a60a10..b767ed6 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -251,6 +251,7 @@ Properties on Targets /prop_tgt/VS_WINRT_EXTENSIONS /prop_tgt/VS_WINRT_REFERENCES /prop_tgt/WIN32_EXECUTABLE + /prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS /prop_tgt/XCODE_ATTRIBUTE_an-attribute /prop_tgt/XCTEST diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 0e6222f..c90016d 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -275,6 +275,7 @@ Variables that Control the Build /variable/CMAKE_USE_RELATIVE_PATHS /variable/CMAKE_VISIBILITY_INLINES_HIDDEN /variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD + /variable/WINDOWS_EXPORT_ALL_SYMBOLS /variable/CMAKE_WIN32_EXECUTABLE /variable/CMAKE_XCODE_ATTRIBUTE_an-attribute /variable/EXECUTABLE_OUTPUT_PATH diff --git a/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst b/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst new file mode 100644 index 000..1c37fd7 --- /dev/null +++ b/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst @@ -0,0 +1,15 @@ +WINDOWS_EXPORT_ALL_SYMBOLS +-- + +This property is implemented only when the compiler supports it. + +This property will automatically create a .def file with all global +symbols found in the input .obj files for a dll on Windows. The def +file will be passed to the linker causing all symbols to be exported +from the dll. For any global data __declspec(dllimport) must still be +used when compiling against the code in the dll. All other function +symbols will be automatically exported and imported by callers. + +This property is initialized by the value of +the :variable:`CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS` variable if it is set +when a target is created. diff --git a/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst b/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst new file mode 100644 index 000..1636842 --- /dev/null +++ b/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst @@ -0,0 +1,6 @@ +CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS + + +Default value for :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property. +This variable is used to initialize the property on each target as it is +created. diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 13fe8bc..1e4ec84 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -45,9 +45,12 @@ else() set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:console") set(_PLATFORM_LINK_FLAGS "") endif() - +# default support WINDOWS_EXPORT_ALL_SYMBOLS +set(CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS 1) if(CMAKE_GENERATOR MATCHES "Visual Studio 6") set (CMAKE_NO_BUILD_TYPE 1) + # WINDOWS_EXPORT_ALL_SYMBOLS not supported for VS6 IDE + set(CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS 0) endif() if(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") set (CMAKE_NO_BUILD_TYPE 1) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 6d012fd..069f283 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -430,6 +430,7 @@ if
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-676-g24f93e9
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 24f93e99d832b9194a158b2f5605a55580b12c52 (commit) via b7728743f9c78ef15a0dcc30b9f22e44d0c65fb9 (commit) from 1a99eb71ed71060d4152fd4deca7edffee197d61 (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=24f93e99d832b9194a158b2f5605a55580b12c52 commit 24f93e99d832b9194a158b2f5605a55580b12c52 Merge: 1a99eb7 b772874 Author: Bill Hoffman AuthorDate: Thu Jun 25 15:11:18 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Jun 25 15:11:18 2015 -0400 Merge topic 'auto_export_dll_symbols' into next b7728743 Use the correct name for the variable CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7728743f9c78ef15a0dcc30b9f22e44d0c65fb9 commit b7728743f9c78ef15a0dcc30b9f22e44d0c65fb9 Author: Bill Hoffman AuthorDate: Thu Jun 25 15:10:23 2015 -0400 Commit: Bill Hoffman CommitDate: Thu Jun 25 15:10:23 2015 -0400 Use the correct name for the variable CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS. diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index c90016d..7c7db5e 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -275,7 +275,7 @@ Variables that Control the Build /variable/CMAKE_USE_RELATIVE_PATHS /variable/CMAKE_VISIBILITY_INLINES_HIDDEN /variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD - /variable/WINDOWS_EXPORT_ALL_SYMBOLS + /variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS /variable/CMAKE_WIN32_EXECUTABLE /variable/CMAKE_XCODE_ATTRIBUTE_an-attribute /variable/EXECUTABLE_OUTPUT_PATH --- Summary of changes: Help/manual/cmake-variables.7.rst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-678-g203c556
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 203c5567d04f1c925588e54b7c0c1c002219dcaa (commit)
via c8a7fa16f5036b192ba98c646e08b88d97b7382c (commit)
from 24f93e99d832b9194a158b2f5605a55580b12c52 (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=203c5567d04f1c925588e54b7c0c1c002219dcaa
commit 203c5567d04f1c925588e54b7c0c1c002219dcaa
Merge: 24f93e9 c8a7fa1
Author: Bill Hoffman
AuthorDate: Thu Jun 25 17:02:57 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 25 17:02:57 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
c8a7fa16 use Debug directory to find exe on Xcode
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8a7fa16f5036b192ba98c646e08b88d97b7382c
commit c8a7fa16f5036b192ba98c646e08b88d97b7382c
Author: Bill Hoffman
AuthorDate: Thu Jun 25 17:01:44 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Jun 25 17:01:44 2015 -0400
use Debug directory to find exe on Xcode
diff --git a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
index ee89023..09cd42a 100644
--- a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
+++ b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
@@ -12,7 +12,7 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 6")
endif()
# we build debug so the say.exe will be found in Debug/say.exe for
# Visual Studio generators
-if("${RunCMake_GENERATOR}" MATCHES "Visual Studio")
+if("${RunCMake_GENERATOR}" MATCHES "Visual Studio|Xcode")
set(INTDIR "Debug/")
endif()
# build AutoExport
---
Summary of changes:
Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-681-gb704a70
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 b704a70345c60887b39b438cadd29c9d2f08abfd (commit)
via e8351d01690f1f06e22827673d700120a94e388e (commit)
via 4e2ba4659441c6724c26c5b59a054b623c47d7f2 (commit)
from 203c5567d04f1c925588e54b7c0c1c002219dcaa (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=b704a70345c60887b39b438cadd29c9d2f08abfd
commit b704a70345c60887b39b438cadd29c9d2f08abfd
Merge: 203c556 e8351d0
Author: Bill Hoffman
AuthorDate: Thu Jun 25 19:23:55 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 25 19:23:55 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
e8351d01 remove warning on borland
4e2ba465 clean up a bit
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8351d01690f1f06e22827673d700120a94e388e
commit e8351d01690f1f06e22827673d700120a94e388e
Author: Bill Hoffman
AuthorDate: Thu Jun 25 18:08:34 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Jun 25 18:08:34 2015 -0400
remove warning on borland
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 407a815..e94282a 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -186,7 +186,7 @@ HaveExportedObjects(PIMAGE_FILE_HEADER pImageFileHeader,
void
DumpExternalsObjects(PIMAGE_SYMBOL pSymbolTable,
PIMAGE_SECTION_HEADER pSectionHeaders,
- FILE *fout, unsigned cSymbols)
+ FILE *fout, DWORD_PTR cSymbols)
{
unsigned i;
PSTR stringTable;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e2ba4659441c6724c26c5b59a054b623c47d7f2
commit 4e2ba4659441c6724c26c5b59a054b623c47d7f2
Author: Bill Hoffman
AuthorDate: Thu Jun 25 18:04:23 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Jun 25 18:04:23 2015 -0400
clean up a bit
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index bdf3f41..6b9923a 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -34,6 +34,10 @@
#include
#include // required for atoi
+#ifdef _WIN32
+// defined in binexplib.cxx
+void DumpFile(const char* filename, FILE *fout);
+#endif
void CMakeCommandUsage(const char* program)
{
@@ -213,9 +217,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
#ifdef _WIN32
else if(args[1] == "__create_def")
{
- // defined in binexplib.cxx
- void
-DumpFile(const char* filename, FILE *fout);
if(args.size() < 4)
{
std::cerr <<
@@ -240,7 +241,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector&
args)
std::string objfile;
while(cmSystemTools::GetLineFromStream(fin, objfile))
{
-// needed fort for bzip2 c code with WINAPI calls
DumpFile(objfile.c_str(), fout);
}
return 0;
---
Summary of changes:
Source/bindexplib.cxx |2 +-
Source/cmcmd.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-707-gadfbae3
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 adfbae333bffef484a851a7e6c97d5a8ca459bc5 (commit)
via 6d42ecb5775b3a9b83e96b3f8db2c62a0f5913fe (commit)
from d71d2d58dfb31a670e0c19ab5a17f5152b04d676 (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=adfbae333bffef484a851a7e6c97d5a8ca459bc5
commit adfbae333bffef484a851a7e6c97d5a8ca459bc5
Merge: d71d2d5 6d42ecb
Author: Bill Hoffman
AuthorDate: Fri Jun 26 11:07:18 2015 -0400
Commit: CMake Topic Stage
CommitDate: Fri Jun 26 11:07:18 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
6d42ecb5 fix various dashboard warnings and errors
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d42ecb5775b3a9b83e96b3f8db2c62a0f5913fe
commit 6d42ecb5775b3a9b83e96b3f8db2c62a0f5913fe
Author: Bill Hoffman
AuthorDate: Fri Jun 26 11:07:06 2015 -0400
Commit: Bill Hoffman
CommitDate: Fri Jun 26 11:07:06 2015 -0400
fix various dashboard warnings and errors
diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx
b/Tests/RunCMake/AutoExportDll/hello.cxx
index 807a811..ad83420 100644
--- a/Tests/RunCMake/AutoExportDll/hello.cxx
+++ b/Tests/RunCMake/AutoExportDll/hello.cxx
@@ -9,5 +9,5 @@ void hello()
{
std::cout << "hello";
}
-void Hello::operator delete[](void* ptr) {};
-void Hello::operator delete(void* ptr) {};
+void Hello::operator delete[](void*) {};
+void Hello::operator delete(void*) {};
diff --git a/Tests/RunCMake/AutoExportDll/hello.h
b/Tests/RunCMake/AutoExportDll/hello.h
index a151bd1..3749b97 100644
--- a/Tests/RunCMake/AutoExportDll/hello.h
+++ b/Tests/RunCMake/AutoExportDll/hello.h
@@ -13,6 +13,6 @@ class Hello
public:
static winexport int Data;
void real();
- static void operator delete[](void* ptr);
- static void operator delete(void* ptr);
+ static void operator delete[](void*);
+ static void operator delete(void*);
};
diff --git a/Tests/RunCMake/AutoExportDll/say.cxx
b/Tests/RunCMake/AutoExportDll/say.cxx
index 015c3a8..655b3c2 100644
--- a/Tests/RunCMake/AutoExportDll/say.cxx
+++ b/Tests/RunCMake/AutoExportDll/say.cxx
@@ -1,4 +1,4 @@
-#include
+#include
#include "hello.h"
#ifdef _MSC_VER
#include "windows.h"
@@ -26,10 +26,12 @@ int main()
Hello h;
h.real();
hello();
- std::cout << " ";
+ printf(" ");
world();
- std::cout << "\n" << foo() << "\n";
- std::cout << "\n" << bar() << "\n";
- std::cout << "\n";
+ printf("\n");
+ foo();
+ printf("\n");
+ bar();
+ printf("\n");
return 0;
}
---
Summary of changes:
Tests/RunCMake/AutoExportDll/hello.cxx |4 ++--
Tests/RunCMake/AutoExportDll/hello.h |4 ++--
Tests/RunCMake/AutoExportDll/say.cxx | 12 +++-
3 files changed, 11 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-707-gfbde295
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 fbde295974f8dd6a04bde1a48e2cd43034b3af98 (commit)
via 8ccdfb754a5f3b4c74b7725677bf0900785fa47d (commit)
from 24fad5b0f0ddd90bd6fd6c47e263527e99299dd3 (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=fbde295974f8dd6a04bde1a48e2cd43034b3af98
commit fbde295974f8dd6a04bde1a48e2cd43034b3af98
Merge: 24fad5b 8ccdfb7
Author: Bill Hoffman
AuthorDate: Fri Jun 26 16:49:26 2015 -0400
Commit: CMake Topic Stage
CommitDate: Fri Jun 26 16:49:26 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
8ccdfb75 Add clean to the export test and change the obj list name to avoid
removal.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ccdfb754a5f3b4c74b7725677bf0900785fa47d
commit 8ccdfb754a5f3b4c74b7725677bf0900785fa47d
Author: Bill Hoffman
AuthorDate: Fri Jun 26 16:48:57 2015 -0400
Commit: Bill Hoffman
CommitDate: Fri Jun 26 16:48:57 2015 -0400
Add clean to the export test and change the obj list name to avoid removal.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 61cec6c..bdc3c98 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -917,7 +917,7 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
std::string objs_file = gt->Target->GetName();
objs_file += ".dir/" + configName;
cmSystemTools::MakeDirectory(objs_file.c_str());
- objs_file += "/exportall.def.objs";
+ objs_file += "/objects.txt";
cmdl.push_back(objs_file);
std::ofstream fout(objs_file.c_str());
if(!fout)
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 03acf2f..024a1c5 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2473,7 +2473,7 @@
cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
const char *autodef = this->Target->GetProperty(autodef_prop);
if (autodef && *autodef)
{
- linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)/exportall.def");
+ linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)exportall.def");
}
}
diff --git a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
index f4e08ec..8a2a174 100644
--- a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
+++ b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
@@ -17,7 +17,7 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio|Xcode")
endif()
# build AutoExport
run_cmake_command(AutoExportBuild ${CMAKE_COMMAND} --build
- ${RunCMake_TEST_BINARY_DIR} --config Debug)
+ ${RunCMake_TEST_BINARY_DIR} --config Debug --clean-first)
# run the executable that uses symbols from the dll
if(WIN32)
set(EXE_EXT ".exe")
---
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx|2 +-
Source/cmVisualStudio10TargetGenerator.cxx |2 +-
Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-710-g26d88d3
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 26d88d323f21fa292b6a2990f3522e7f87ff0787 (commit)
via 7998915e3bf8aa18940d488ec3238b195615723a (commit)
via 003099bc92fd3f0cdd97e7524900f28a84db2a5a (commit)
from fbde295974f8dd6a04bde1a48e2cd43034b3af98 (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=26d88d323f21fa292b6a2990f3522e7f87ff0787
commit 26d88d323f21fa292b6a2990f3522e7f87ff0787
Merge: fbde295 7998915
Author: Bill Hoffman
AuthorDate: Sat Jun 27 17:33:06 2015 -0400
Commit: CMake Topic Stage
CommitDate: Sat Jun 27 17:33:06 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
7998915e Handle sub directory libraries with export all dll and add a test
for it.
003099bc Do not use iostream because some older compilers get it wrong.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7998915e3bf8aa18940d488ec3238b195615723a
commit 7998915e3bf8aa18940d488ec3238b195615723a
Author: Bill Hoffman
AuthorDate: Sat Jun 27 17:32:05 2015 -0400
Commit: Bill Hoffman
CommitDate: Sat Jun 27 17:32:05 2015 -0400
Handle sub directory libraries with export all dll and add a test for it.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index bdc3c98..7a8ac86 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -893,7 +893,8 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
std::string const& configName)
{
std::vector outputs;
- std::string deffile = "$(IntDir)/exportall.def";
+ std::string deffile = gt->ObjectDirectory;
+ deffile += "/exportall.def";
outputs.push_back(deffile);
std::vector empty;
std::vector objectSources;
@@ -914,8 +915,11 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
cmdl.push_back("-E");
cmdl.push_back("__create_def");
cmdl.push_back(deffile);
- std::string objs_file = gt->Target->GetName();
- objs_file += ".dir/" + configName;
+ std::string obj_dir_expanded = obj_dir;
+ cmSystemTools::ReplaceString(obj_dir_expanded,
+ this->GetCMakeCFGIntDir(),
+ configName.c_str());
+ std::string objs_file = obj_dir_expanded;
cmSystemTools::MakeDirectory(objs_file.c_str());
objs_file += "/objects.txt";
cmdl.push_back(objs_file);
diff --git a/Tests/RunCMake/AutoExportDll/AutoExport.cmake
b/Tests/RunCMake/AutoExportDll/AutoExport.cmake
index c426f66..3b2b2c5 100644
--- a/Tests/RunCMake/AutoExportDll/AutoExport.cmake
+++ b/Tests/RunCMake/AutoExportDll/AutoExport.cmake
@@ -1,5 +1,7 @@
project(autoexport)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${autoexport_BINARY_DIR}/bin)
+add_subdirectory(sub)
add_library(autoexport SHARED hello.cxx world.cxx foo.c)
add_executable(say say.cxx)
-target_link_libraries(say autoexport)
+target_link_libraries(say autoexport autoexport2)
diff --git a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
index 8a2a174..3784a6a 100644
--- a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
+++ b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
@@ -23,4 +23,4 @@ if(WIN32)
set(EXE_EXT ".exe")
endif()
run_cmake_command(AutoExportRun
- ${RunCMake_BINARY_DIR}/AutoExport-build/${INTDIR}say${EXE_EXT})
+ ${RunCMake_BINARY_DIR}/AutoExport-build/bin/${INTDIR}say${EXE_EXT})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=003099bc92fd3f0cdd97e7524900f28a84db2a5a
commit 003099bc92fd3f0cdd97e7524900f28a84db2a5a
Author: Bill Hoffman
AuthorDate: Sat Jun 27 17:24:21 2015 -0400
Commit: Bill Hoffman
CommitDate: Sat Jun 27 17:24:21 2015 -0400
Do not use iostream because some older compilers get it wrong.
diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx
b/Tests/RunCMake/AutoExportDll/hello.cxx
index ad83420..3933fc1 100644
--- a/Tests/RunCMake/AutoExportDll/hello.cxx
+++ b/Tests/RunCMake/AutoExportDll/hello.cxx
@@ -1,4 +1,4 @@
-#include
+#include
#include "hello.h"
int Hello::Data = 0;
void Hello::real()
@@ -7,7 +7,7 @@ void Hello::real()
}
void hello()
{
- std::cout << "hello";
+ printf("hello");
}
void Hello::operator delete[](void*) {};
void Hello::operator delete(void*) {};
diff --git a/Tests/RunCMake/AutoExportDll/world.cxx
b/Tests/RunCMake/AutoExportDll/world.cxx
index 8107949..3a54df3 100644
--- a/Tests/RunCMake/AutoExportDll/world.cxx
+++
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-712-g884eb43
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 884eb43e9b752e15f80f5ce69bd18388794f5adb (commit)
via e58ec8faabd019c0a13219cfb86a5585a67a4b66 (commit)
from 26d88d323f21fa292b6a2990f3522e7f87ff0787 (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=884eb43e9b752e15f80f5ce69bd18388794f5adb
commit 884eb43e9b752e15f80f5ce69bd18388794f5adb
Merge: 26d88d3 e58ec8f
Author: Bill Hoffman
AuthorDate: Sun Jun 28 08:39:18 2015 -0400
Commit: CMake Topic Stage
CommitDate: Sun Jun 28 08:39:18 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
e58ec8fa add missing sub dir
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e58ec8faabd019c0a13219cfb86a5585a67a4b66
commit e58ec8faabd019c0a13219cfb86a5585a67a4b66
Author: Bill Hoffman
AuthorDate: Sun Jun 28 08:39:03 2015 -0400
Commit: Bill Hoffman
CommitDate: Sun Jun 28 08:39:03 2015 -0400
add missing sub dir
diff --git a/Tests/RunCMake/AutoExportDll/sub/CMakeLists.txt
b/Tests/RunCMake/AutoExportDll/sub/CMakeLists.txt
new file mode 100644
index 000..dee33e6
--- /dev/null
+++ b/Tests/RunCMake/AutoExportDll/sub/CMakeLists.txt
@@ -0,0 +1 @@
+add_library(autoexport2 SHARED sub.cxx)
diff --git a/Tests/RunCMake/AutoExportDll/sub/sub.cxx
b/Tests/RunCMake/AutoExportDll/sub/sub.cxx
new file mode 100644
index 000..9766b41
--- /dev/null
+++ b/Tests/RunCMake/AutoExportDll/sub/sub.cxx
@@ -0,0 +1,4 @@
+int sub()
+{
+ return 10;
+}
---
Summary of changes:
Tests/RunCMake/AutoExportDll/sub/CMakeLists.txt |1 +
Tests/{SubProject/gen.cxx.in => RunCMake/AutoExportDll/sub/sub.cxx} |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 Tests/RunCMake/AutoExportDll/sub/CMakeLists.txt
copy Tests/{SubProject/gen.cxx.in => RunCMake/AutoExportDll/sub/sub.cxx} (62%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-801-g6242647
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 62426472d6b2126c0c615dececef351754d2cc4b (commit)
via e3d1399d7e2380b9958252c479c3d81336a7e546 (commit)
via e03171ecb554c3688ad776b44ce5e2728ea4210e (commit)
via 3873507a77446696877cf0043c61babf601a7a36 (commit)
from 324dcf1cfff8ab7ddea0e3697f215487fcb39c72 (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=62426472d6b2126c0c615dececef351754d2cc4b
commit 62426472d6b2126c0c615dececef351754d2cc4b
Merge: 324dcf1 e3d1399
Author: Bill Hoffman
AuthorDate: Thu Jul 2 18:07:13 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jul 2 18:07:13 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
e3d1399d Merge branch 'auto_export_dll_symbols' of
git://cmake.org/stage/cmake into auto_export_dll_symbols
e03171ec Make sure only .obj files are listed and only enable export if
property is on.
3873507a Add support for /bigobj format and a test for it.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3d1399d7e2380b9958252c479c3d81336a7e546
commit e3d1399d7e2380b9958252c479c3d81336a7e546
Merge: e03171e 7fe42a1
Author: Bill Hoffman
AuthorDate: Thu Jul 2 17:59:07 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Jul 2 17:59:07 2015 -0400
Merge branch 'auto_export_dll_symbols' of git://cmake.org/stage/cmake into
auto_export_dll_symbols
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e03171ecb554c3688ad776b44ce5e2728ea4210e
commit e03171ecb554c3688ad776b44ce5e2728ea4210e
Author: Bill Hoffman
AuthorDate: Thu Jul 2 17:47:25 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Jul 2 17:47:25 2015 -0400
Make sure only .obj files are listed and only enable export if property is
on.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index a41e843..bc134e1 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -20,6 +20,7 @@
#include "cmSourceFile.h"
#include "cmTarget.h"
#include
+#include "cmAlgorithms.h"
//
cmGlobalVisualStudioGenerator::cmGlobalVisualStudioGenerator(cmake* cm)
@@ -942,7 +943,10 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
// replace $(ConfigurationName) in the object names
cmSystemTools::ReplaceString(objFile, this->GetCMakeCFGIntDir(),
configName.c_str());
-fout << objFile << "\n";
+if(cmHasLiteralSuffix(objFile, ".obj"))
+ {
+ fout << objFile << "\n";
+ }
}
cmCustomCommandLines commandLines;
commandLines.push_back(cmdl);
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index e4eb014..a0e9e4d 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1084,9 +1084,7 @@ void
cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
if (target.GetType() == cmTarget::SHARED_LIBRARY &&
this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
{
-std::string const autodef_prop = "WINDOWS_EXPORT_ALL_SYMBOLS";
-const char *autodef = target.GetProperty(autodef_prop);
-if (autodef && *autodef)
+if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
{
linkOptions.AddFlag("ModuleDefinitionFile", "$(IntDir)/exportall.def");
}
@@ -2029,9 +2027,7 @@ void cmLocalVisualStudio7Generator
if (target.GetType() == cmTarget::SHARED_LIBRARY &&
this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS"))
{
-std::string const autodef_prop = "WINDOWS_EXPORT_ALL_SYMBOLS";
-const char *autodef = target.GetProperty(autodef_prop);
-if (autodef && *autodef)
+if (target.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"))
{
addedPrelink = true;
std::vector commands =
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx
b/Source/cmMakefileLibraryTargetGenerator.cxx
index ffdd27b..696dcc4 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -18,6 +18,7 @@
#include "cmSourceFile.h"
#include "cmTarget.h"
#include "cmake.h"
+#include "cmAlgori
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-803-g0406436
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 0406436e8a1ad973afc64fbab779b616f6c896d5 (commit)
via 0317aa7488a8dc26e0dcc3370f1b32847ca9a78c (commit)
from 62426472d6b2126c0c615dececef351754d2cc4b (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=0406436e8a1ad973afc64fbab779b616f6c896d5
commit 0406436e8a1ad973afc64fbab779b616f6c896d5
Merge: 6242647 0317aa7
Author: Bill Hoffman
AuthorDate: Thu Jul 2 21:04:17 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jul 2 21:04:17 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
0317aa74 Define ANON_OBJECT_HEADER_BIGOBJ as it is not found on all systems.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0317aa7488a8dc26e0dcc3370f1b32847ca9a78c
commit 0317aa7488a8dc26e0dcc3370f1b32847ca9a78c
Author: Bill Hoffman
AuthorDate: Thu Jul 2 21:03:22 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Jul 2 21:03:22 2015 -0400
Define ANON_OBJECT_HEADER_BIGOBJ as it is not found on all systems.
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 48d7b7e..b2a6c17 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -78,6 +78,26 @@
#include
#include
+typedef struct cmANON_OBJECT_HEADER_BIGOBJ {
+ /* same as ANON_OBJECT_HEADER_V2 */
+WORDSig1;// Must be IMAGE_FILE_MACHINE_UNKNOWN
+WORDSig2;// Must be 0x
+WORDVersion; // >= 2 (implies the Flags field is present)
+WORDMachine; // Actual machine - IMAGE_FILE_MACHINE_xxx
+DWORD TimeDateStamp;
+CLSID ClassID; // {D1BAA1C7-BAEE-4ba9-AF20-FAF66AA4DCB8}
+DWORD SizeOfData; // Size of data that follows the header
+DWORD Flags; // 0x1 -> contains metadata
+DWORD MetaDataSize;// Size of CLR metadata
+DWORD MetaDataOffset; // Offset of CLR metadata
+
+/* bigobj specifics */
+DWORD NumberOfSections; // extended from WORD
+DWORD PointerToSymbolTable;
+DWORD NumberOfSymbols;
+} cmANON_OBJECT_HEADER_BIGOBJ;
+
+
PIMAGE_SECTION_HEADER GetSectionHeaderOffset(PIMAGE_FILE_HEADER
pImageFileHeader)
{
@@ -87,12 +107,12 @@ PIMAGE_SECTION_HEADER
GetSectionHeaderOffset(PIMAGE_FILE_HEADER
pImageFileHeader->SizeOfOptionalHeader);
}
-PIMAGE_SECTION_HEADER GetSectionHeaderOffset(ANON_OBJECT_HEADER_BIGOBJ*
+PIMAGE_SECTION_HEADER GetSectionHeaderOffset(cmANON_OBJECT_HEADER_BIGOBJ*
pImageFileHeader)
{
return (PIMAGE_SECTION_HEADER)
((DWORD_PTR)pImageFileHeader +
- sizeof(ANON_OBJECT_HEADER_BIGOBJ));
+ sizeof(cmANON_OBJECT_HEADER_BIGOBJ));
}
/*
@@ -120,7 +140,7 @@ const char* StrNStr(const char* start, const char* find,
size_t &size) {
}
template <
- // ANON_OBJECT_HEADER_BIGOBJ or IMAGE_FILE_HEADER
+ // cmANON_OBJECT_HEADER_BIGOBJ or IMAGE_FILE_HEADER
class ObjectHeaderType,
// PIMAGE_SYMBOL_EX or PIMAGE_SYMBOL
class SymbolTableType>
@@ -380,11 +400,12 @@ DumpFile(const char* filename, FILE *fout)
symbolDumper.DumpObjFile();
} else {
// check for /bigobj format
- ANON_OBJECT_HEADER_BIGOBJ* h = (ANON_OBJECT_HEADER_BIGOBJ*) lpFileBase;
+ cmANON_OBJECT_HEADER_BIGOBJ* h =
+ (cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase;
if(h->Sig1 == 0x0 && h->Sig2 == 0x)
{
- DumpSymbols
- symbolDumper((ANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout);
+ DumpSymbols
+ symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout);
symbolDumper.DumpObjFile();
}
// if we don't know what it is die so the build will stop
---
Summary of changes:
Source/bindexplib.cxx | 33 +++--
1 file changed, 27 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-805-g5d3276f
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 5d3276f7d3a1b99fc985d0fa587987c1271fc407 (commit)
via f15c3b309c34b0a700cf9312ca50357f386feedb (commit)
from 0406436e8a1ad973afc64fbab779b616f6c896d5 (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=5d3276f7d3a1b99fc985d0fa587987c1271fc407
commit 5d3276f7d3a1b99fc985d0fa587987c1271fc407
Merge: 0406436 f15c3b3
Author: Bill Hoffman
AuthorDate: Thu Jul 2 23:21:00 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jul 2 23:21:00 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
f15c3b30 Devine IMAGE_SYMBOL_EX in this file because it is not in all
WinNT.h files.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f15c3b309c34b0a700cf9312ca50357f386feedb
commit f15c3b309c34b0a700cf9312ca50357f386feedb
Author: Bill Hoffman
AuthorDate: Thu Jul 2 23:19:59 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Jul 2 23:19:59 2015 -0400
Devine IMAGE_SYMBOL_EX in this file because it is not in all WinNT.h files.
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index b2a6c17..861436f 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -97,6 +97,22 @@ typedef struct cmANON_OBJECT_HEADER_BIGOBJ {
DWORD NumberOfSymbols;
} cmANON_OBJECT_HEADER_BIGOBJ;
+typedef struct _cmIMAGE_SYMBOL_EX {
+union {
+BYTE ShortName[8];
+struct {
+DWORD Short; // if 0, use LongName
+DWORD Long; // offset into string table
+} Name;
+DWORD LongName[2];// PBYTE [2]
+} N;
+DWORD Value;
+LONGSectionNumber;
+WORDType;
+BYTEStorageClass;
+BYTENumberOfAuxSymbols;
+} cmIMAGE_SYMBOL_EX;
+typedef cmIMAGE_SYMBOL_EX UNALIGNED *PcmIMAGE_SYMBOL_EX;
PIMAGE_SECTION_HEADER GetSectionHeaderOffset(PIMAGE_FILE_HEADER
pImageFileHeader)
@@ -142,7 +158,7 @@ const char* StrNStr(const char* start, const char* find,
size_t &size) {
template <
// cmANON_OBJECT_HEADER_BIGOBJ or IMAGE_FILE_HEADER
class ObjectHeaderType,
- // PIMAGE_SYMBOL_EX or PIMAGE_SYMBOL
+ // PcmIMAGE_SYMBOL_EX or PIMAGE_SYMBOL
class SymbolTableType>
class DumpSymbols
{
@@ -404,7 +420,7 @@ DumpFile(const char* filename, FILE *fout)
(cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase;
if(h->Sig1 == 0x0 && h->Sig2 == 0x)
{
- DumpSymbols
+ DumpSymbols
symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout);
symbolDumper.DumpObjFile();
}
---
Summary of changes:
Source/bindexplib.cxx | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.1-2853-ge6cc5a9
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 e6cc5a9fff4689e8b0818e0a21f59f65f1ce7fd3 (commit)
via 5487b1be38c2003132ec4ddbb1dca615474777e4 (commit)
from 54329e174573e7d6f5aa497074e4a37bd8167750 (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=e6cc5a9fff4689e8b0818e0a21f59f65f1ce7fd3
commit e6cc5a9fff4689e8b0818e0a21f59f65f1ce7fd3
Merge: 54329e1 5487b1b
Author: Bill Hoffman
AuthorDate: Thu Sep 10 17:16:13 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 10 17:16:13 2015 -0400
Merge topic 'fix_64bit_autodef' into next
5487b1be Fix autoexport feature for 64 bit Windows builds by not removing
leading _
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5487b1be38c2003132ec4ddbb1dca615474777e4
commit 5487b1be38c2003132ec4ddbb1dca615474777e4
Author: Bill Hoffman
AuthorDate: Thu Sep 10 17:12:41 2015 -0400
Commit: Bill Hoffman
CommitDate: Thu Sep 10 17:12:41 2015 -0400
Fix autoexport feature for 64 bit Windows builds by not removing leading _
With 64 bit windows builds, there is no need to remove the leading
underscore from all the symbols. This is because it does not have
one in the .obj file unless it is really in the name. This did
not cause any trouble until VS 2015 which has some system functions
that have a leading underscore that end up in the .def file.
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 11e3f34..dc4db63 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -173,7 +173,7 @@ public:
*/
DumpSymbols(ObjectHeaderType* ih,
- FILE* fout) {
+ FILE* fout, bool is64) {
this->ObjectImageHeader = ih;
this->SymbolTable = (SymbolTableType*)
((DWORD_PTR)this->ObjectImageHeader
@@ -183,6 +183,7 @@ public:
GetSectionHeaderOffset(this->ObjectImageHeader);
this->ImportFlag = true;
this->SymbolCount = this->ObjectImageHeader->NumberOfSymbols;
+ this->Is64Bit = is64;
}
/*
@@ -287,7 +288,14 @@ public:
symbol.erase(posAt);
}
}
-if (symbol[0] == '_') symbol.erase(0,1);
+// For 64 bit builds we don't need to remove _
+if(!this->Is64Bit)
+ {
+ if (symbol[0] == '_')
+{
+symbol.erase(0,1);
+}
+ }
if (this->ImportFlag) {
this->ImportFlag = false;
fprintf(this->FileOut,"EXPORTS \n");
@@ -355,6 +363,7 @@ private:
PIMAGE_SECTION_HEADER SectionHeaders;
ObjectHeaderType* ObjectImageHeader;
SymbolTableType* SymbolTable;
+ bool Is64Bit;
};
bool
@@ -406,7 +415,8 @@ DumpFile(const char* filename, FILE *fout)
* and IMAGE_FILE_HEADER.SizeOfOptionalHeader == 0;
*/
DumpSymbols
-symbolDumper((PIMAGE_FILE_HEADER) lpFileBase, fout);
+symbolDumper((PIMAGE_FILE_HEADER) lpFileBase, fout,
+ (dosHeader->e_magic == IMAGE_FILE_MACHINE_AMD64));
symbolDumper.DumpObjFile();
} else {
// check for /bigobj format
@@ -414,7 +424,8 @@ DumpFile(const char* filename, FILE *fout)
(cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase;
if(h->Sig1 == 0x0 && h->Sig2 == 0x) {
DumpSymbols
- symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout);
+ symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, fout,
+(dosHeader->e_magic == IMAGE_FILE_MACHINE_AMD64));
symbolDumper.DumpObjFile();
} else {
printf("unrecognized file format in '%s'\n", filename);
---
Summary of changes:
Source/bindexplib.cxx | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.0-1386-gc8db8b9
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 c8db8b97f9364a6c0677c698f7ce5bde1e4a9742 (commit)
via 7f0ab8ed3696d106d2c0e678ccc614fbaf1ec71f (commit)
from 58f54d3a0288d6210eac005f933cf1d7f5bade53 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8db8b97f9364a6c0677c698f7ce5bde1e4a9742
commit c8db8b97f9364a6c0677c698f7ce5bde1e4a9742
Merge: 58f54d3 7f0ab8e
Author: Bill Hoffman
AuthorDate: Mon Nov 16 15:37:44 2015 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 16 15:37:44 2015 -0500
Merge topic 'unique_def_symbols' into next
7f0ab8ed Make sure the .def files created by CMake contain only unique
symbols.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f0ab8ed3696d106d2c0e678ccc614fbaf1ec71f
commit 7f0ab8ed3696d106d2c0e678ccc614fbaf1ec71f
Author: Bill Hoffman
AuthorDate: Mon Nov 16 15:31:10 2015 -0500
Commit: Bill Hoffman
CommitDate: Mon Nov 16 15:31:10 2015 -0500
Make sure the .def files created by CMake contain only unique symbols.
Prior to this change each .obj files symbols were dumped to the .def file.
This change uses a set to make sure the symbol names are unique.
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index dc4db63..64621e0 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -70,7 +70,7 @@
* Author: Valery Fine 16/09/96 (E-mail: f...@vxcern.cern.ch)
*--
*/
-
+#include "bindexplib.h"
#include
#include
#include
@@ -173,15 +173,17 @@ public:
*/
DumpSymbols(ObjectHeaderType* ih,
- FILE* fout, bool is64) {
+ std::set& symbols,
+ std::set& dataSymbols,
+ bool is64)
+ :Symbols(symbols), DataSymbols(dataSymbols)
+{
this->ObjectImageHeader = ih;
this->SymbolTable = (SymbolTableType*)
((DWORD_PTR)this->ObjectImageHeader
+ this->ObjectImageHeader->PointerToSymbolTable);
- this->FileOut = fout;
this->SectionHeaders =
GetSectionHeaderOffset(this->ObjectImageHeader);
- this->ImportFlag = true;
this->SymbolCount = this->ObjectImageHeader->NumberOfSymbols;
this->Is64Bit = is64;
}
@@ -296,10 +298,6 @@ public:
symbol.erase(0,1);
}
}
-if (this->ImportFlag) {
- this->ImportFlag = false;
- fprintf(this->FileOut,"EXPORTS \n");
-}
/*
Check whether it is "Scalar deleting destructor" and
"Vector deleting destructor"
@@ -319,11 +317,11 @@ public:
SectionHeaders[pSymbolTable->SectionNumber-1].Characteristics;
if (!pSymbolTable->Type && (SectChar & IMAGE_SCN_MEM_WRITE)) {
// Read only (i.e. constants) must be excluded
- fprintf(this->FileOut, "\t%s \t DATA\n", symbol.c_str());
+ this->DataSymbols.insert(symbol);
} else {
if ( pSymbolTable->Type ||
!(SectChar & IMAGE_SCN_MEM_READ)) {
- fprintf(this->FileOut, "\t%s\n", symbol.c_str());
+ this->Symbols.insert(symbol);
} else {
// printf(" strange symbol: %s \n",symbol.c_str());
}
@@ -340,11 +338,7 @@ public:
symbol = stringTable + pSymbolTable->N.Name.Long;
while (isspace(symbol[0])) symbol.erase(0,1);
if (symbol[0] == '_') symbol.erase(0,1);
-if (!this->ImportFlag) {
- this->ImportFlag = true;
- fprintf(this->FileOut,"IMPORTS \n");
-}
-fprintf(this->FileOut, "\t%s DATA \n", symbol.c_str()+1);
+this->DataSymbols.insert(symbol);
}
}
@@ -357,8 +351,8 @@ public:
}
}
private:
- bool ImportFlag;
- FILE* FileOut;
+ std::set& Symbols;
+ std::set& DataSymbols;
DWORD_PTR SymbolCount;
PIMAGE_SECTION_HEADER SectionHeaders;
ObjectHeaderType* ObjectImageHeader;
@@ -367,7 +361,9 @@ private:
};
bool
-DumpFile(const char* filename, FILE *fout)
+DumpFile(const char* filename,
+ std::set& symbols,
+ std::set& dataSymbols)
{
HANDLE hFile;
HANDLE
[Cmake-commits] CMake branch, next, updated. v3.4.0-1388-gad5e439
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 ad5e439deac90094883bf6f050d5877379e22a2c (commit)
via 295b83a84d068b7ad673c586e085901a0779baac (commit)
from c8db8b97f9364a6c0677c698f7ce5bde1e4a9742 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad5e439deac90094883bf6f050d5877379e22a2c
commit ad5e439deac90094883bf6f050d5877379e22a2c
Merge: c8db8b9 295b83a
Author: Bill Hoffman
AuthorDate: Mon Nov 16 16:37:57 2015 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 16 16:37:57 2015 -0500
Merge topic 'unique_def_symbols' into next
295b83a8 add missing file.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=295b83a84d068b7ad673c586e085901a0779baac
commit 295b83a84d068b7ad673c586e085901a0779baac
Author: Bill Hoffman
AuthorDate: Mon Nov 16 16:37:35 2015 -0500
Commit: Bill Hoffman
CommitDate: Mon Nov 16 16:37:35 2015 -0500
add missing file.
diff --git a/Source/bindexplib.h b/Source/bindexplib.h
new file mode 100644
index 000..8661a4a
--- /dev/null
+++ b/Source/bindexplib.h
@@ -0,0 +1,29 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+*/
+
+#ifndef bindexplib_h
+#define bindexplib_h
+
+#include "cmStandardIncludes.h"
+
+
+class bindexplib
+{
+public:
+ bindexplib() {}
+ bool AddObjectFile(const char* filename);
+ void WriteFile(FILE* file);
+private:
+ std::set Symbols;
+ std::set DataSymbols;
+};
+#endif
---
Summary of changes:
Source/{cmVersionMacros.h => bindexplib.h} | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
copy Source/{cmVersionMacros.h => bindexplib.h} (67%)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.0-1441-gacb550c
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 acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795 (commit)
via 75004280af22edd22a3efb7b47d5d87f2da65354 (commit)
from e8f8a0805ff5cf70cd962c8365dcff47797cb45d (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795
commit acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795
Merge: e8f8a08 7500428
Author: Bill Hoffman
AuthorDate: Thu Nov 19 17:24:20 2015 -0500
Commit: CMake Topic Stage
CommitDate: Thu Nov 19 17:24:20 2015 -0500
Merge topic 'fix_bigobj_64_autodef' into next
75004280 Fix auto export symbols for Dlls containing /bigobj for 64bit
builds.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75004280af22edd22a3efb7b47d5d87f2da65354
commit 75004280af22edd22a3efb7b47d5d87f2da65354
Author: Bill Hoffman
AuthorDate: Thu Nov 19 17:21:03 2015 -0500
Commit: Bill Hoffman
CommitDate: Thu Nov 19 17:21:03 2015 -0500
Fix auto export symbols for Dlls containing /bigobj for 64bit builds.
This fixes a bug where 64 bit builds with /bigobj incorrectly determined
that the object files were not 64 bit. This manifested itself with
printf type functions showing up as undefined because the leading
underscore was being removed and should not be removed.
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 64621e0..e7263ae 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -422,7 +422,7 @@ DumpFile(const char* filename,
DumpSymbols
symbolDumper((cmANON_OBJECT_HEADER_BIGOBJ*) lpFileBase, symbols,
dataSymbols,
-(dosHeader->e_magic == IMAGE_FILE_MACHINE_AMD64));
+(h->Machine == IMAGE_FILE_MACHINE_AMD64));
symbolDumper.DumpObjFile();
} else {
printf("unrecognized file format in '%s'\n", filename);
diff --git a/Tests/RunCMake/AutoExportDll/sub/sub.cxx
b/Tests/RunCMake/AutoExportDll/sub/sub.cxx
index 9766b41..9a3145e 100644
--- a/Tests/RunCMake/AutoExportDll/sub/sub.cxx
+++ b/Tests/RunCMake/AutoExportDll/sub/sub.cxx
@@ -1,4 +1,6 @@
+#include
int sub()
{
+ printf("");
return 10;
}
---
Summary of changes:
Source/bindexplib.cxx|2 +-
Tests/RunCMake/AutoExportDll/sub/sub.cxx |2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4267-gfb9821f
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 fb9821f70dd959c377458ac15a0f9a8e35321c73 (commit)
via 4cc5c46ba26682dba9c800fe0963be2fab5a5734 (commit)
from 50812834abca50370338b8a86bdcf956406ad370 (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=fb9821f70dd959c377458ac15a0f9a8e35321c73
commit fb9821f70dd959c377458ac15a0f9a8e35321c73
Merge: 5081283 4cc5c46
Author: Bill Hoffman
AuthorDate: Fri Sep 20 17:53:21 2013 -0400
Commit: CMake Topic Stage
CommitDate: Fri Sep 20 17:53:21 2013 -0400
Merge topic 'add_cache_options_to_ccmake' into next
4cc5c46 Teach ccmake to understand cache option strings.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cc5c46ba26682dba9c800fe0963be2fab5a5734
commit 4cc5c46ba26682dba9c800fe0963be2fab5a5734
Author: Bill Hoffman
AuthorDate: Fri Sep 20 17:47:38 2013 -0400
Commit: Bill Hoffman
CommitDate: Fri Sep 20 17:47:38 2013 -0400
Teach ccmake to understand cache option strings.
This commit adds the ability to ccmake of cycling through cache options.
This uses the STRINGS property of the cache entry. The enter key will cycle
forward, and the right and left arrows will go up and down in the list.
diff --git a/Source/CursesDialog/CMakeLists.txt
b/Source/CursesDialog/CMakeLists.txt
index 5efc2fb..548f5a5 100644
--- a/Source/CursesDialog/CMakeLists.txt
+++ b/Source/CursesDialog/CMakeLists.txt
@@ -11,6 +11,7 @@
#=
set( CURSES_SRCS
+ CursesDialog/cmCursesOptionsWidget
CursesDialog/cmCursesBoolWidget
CursesDialog/cmCursesCacheEntryComposite
CursesDialog/cmCursesDummyWidget
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index c58d037..249137f 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@@ -10,6 +10,7 @@
See the License for more information.
*/
#include "cmCursesCacheEntryComposite.h"
+#include "cmCursesOptionsWidget.h"
#include "cmCursesStringWidget.h"
#include "cmCursesLabelWidget.h"
#include "cmCursesBoolWidget.h"
@@ -69,9 +70,27 @@ cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
it.GetValue());
break;
case cmCacheManager::STRING:
- this->Entry = new cmCursesStringWidget(this->EntryWidth, 1, 1, 1);
- static_cast(this->Entry)->SetString(
-it.GetValue());
+ if(it.PropertyExists("STRINGS"))
+{
+cmCursesOptionsWidget* ow =
+ new cmCursesOptionsWidget(this->EntryWidth, 1, 1, 1);
+this->Entry = ow;
+std::vector options;
+cmSystemTools::ExpandListArgument(
+ std::string(it.GetProperty("STRINGS")), options);
+for(std::vector::iterator
+ si = options.begin(); si != options.end(); ++si)
+ {
+ ow->AddOption(*si);
+ }
+ow->SetOption(it.GetValue());
+}
+ else
+{
+this->Entry = new cmCursesStringWidget(this->EntryWidth, 1, 1, 1);
+static_cast(this->Entry)->SetString(
+ it.GetValue());
+}
break;
case cmCacheManager::UNINITIALIZED:
cmSystemTools::Error("Found an undefined variable: ", it.GetName());
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx
b/Source/CursesDialog/cmCursesOptionsWidget.cxx
new file mode 100644
index 000..652b2df
--- /dev/null
+++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx
@@ -0,0 +1,106 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ Distributed under the OSI-approved BSD License (the "License");
+ see accompanying file Copyright.txt for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License for more information.
+*/
+#include "cmCursesOptionsWidget.h"
+#include "cmCursesMainForm.h"
+
+inline int ctrl(int z)
+{
+return (z&037);
+}
+
+cmCursesOptionsWidget::cmCursesOptio
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4280-gb5fa10f
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 b5fa10ffc7edabe103808def52ee0efe39fafa6b (commit) via d4fd8fef47915c9bb1604b5b070f2ab15252c88e (commit) from 503b63ed9bb8edf3c357e65081b0ee3f2397900e (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=b5fa10ffc7edabe103808def52ee0efe39fafa6b commit b5fa10ffc7edabe103808def52ee0efe39fafa6b Merge: 503b63e d4fd8fe Author: Bill Hoffman AuthorDate: Mon Sep 23 12:47:11 2013 -0400 Commit: CMake Topic Stage CommitDate: Mon Sep 23 12:47:11 2013 -0400 Merge topic 'add_cache_options_to_ccmake' into next d4fd8fe Use size_type instead of unsigned int to avoid warndings. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4fd8fef47915c9bb1604b5b070f2ab15252c88e commit d4fd8fef47915c9bb1604b5b070f2ab15252c88e Author: Bill Hoffman AuthorDate: Mon Sep 23 12:46:24 2013 -0400 Commit: Bill Hoffman CommitDate: Mon Sep 23 12:46:24 2013 -0400 Use size_type instead of unsigned int to avoid warndings. diff --git a/Source/CursesDialog/cmCursesOptionsWidget.h b/Source/CursesDialog/cmCursesOptionsWidget.h index be7d413..b52ac9d 100644 --- a/Source/CursesDialog/cmCursesOptionsWidget.h +++ b/Source/CursesDialog/cmCursesOptionsWidget.h @@ -33,7 +33,7 @@ protected: cmCursesOptionsWidget(const cmCursesOptionsWidget& from); void operator=(const cmCursesOptionsWidget&); std::vector Options; - unsigned int CurrentOption; + std::vector::size_type CurrentOption; }; #endif // __cmCursesOptionsWidget_h --- Summary of changes: Source/CursesDialog/cmCursesOptionsWidget.h |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
[Cmake-commits] CMake branch, next, updated. v3.0.0-3727-gf207a13
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 f207a13efca9d5ecf8c188651291ff5aa18f77e7 (commit)
via 58cc3c22ef4a011196b0305bfee861dadd243414 (commit)
via ba36363121f2004c196e785d5b67883a09160ec0 (commit)
from 0d85199e454b4b20bc6462e9c4bbb5bff9a8f037 (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=f207a13efca9d5ecf8c188651291ff5aa18f77e7
commit f207a13efca9d5ecf8c188651291ff5aa18f77e7
Merge: 0d85199 58cc3c2
Author: Bill Hoffman
AuthorDate: Fri Jun 13 14:45:31 2014 -0400
Commit: CMake Topic Stage
CommitDate: Fri Jun 13 14:45:31 2014 -0400
Merge topic 'fix-valgrind-in-path' into next
58cc3c22 Fix ctest to allow valgrind to show up in the path name of a
memcheck tool.
ba363631 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58cc3c22ef4a011196b0305bfee861dadd243414
commit 58cc3c22ef4a011196b0305bfee861dadd243414
Author: Bill Hoffman
AuthorDate: Fri Jun 13 14:42:43 2014 -0400
Commit: Bill Hoffman
CommitDate: Fri Jun 13 14:42:43 2014 -0400
Fix ctest to allow valgrind to show up in the path name of a memcheck tool.
For testing purposes CMake creates dummy memory checkers. The dummy
checkers
are in the CMake build tree. Before this change when the path contained the
string valgrind, such as CMake-valgrind, all the checkers were thought to
be valgrind, and this caused tests to fail.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index ecaa474..09d0ad8 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -423,17 +423,18 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
{
this->MemoryTester
= this->CTest->GetCTestConfiguration("MemoryCheckCommand").c_str();
-
+std::string testerName =
+ cmSystemTools::GetFilenameName(this->MemoryTester);
// determine the checker type
-if ( this->MemoryTester.find("valgrind") != std::string::npos )
+if ( testerName.find("valgrind") != std::string::npos )
{
this->MemoryTesterStyle = cmCTestMemCheckHandler::VALGRIND;
}
-else if ( this->MemoryTester.find("purify") != std::string::npos )
+else if ( testerName.find("purify") != std::string::npos )
{
this->MemoryTesterStyle = cmCTestMemCheckHandler::PURIFY;
}
-else if ( this->MemoryTester.find("BC") != std::string::npos )
+else if ( testerName.find("BC") != std::string::npos )
{
this->MemoryTesterStyle = cmCTestMemCheckHandler::BOUNDS_CHECKER;
}
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/CTest/cmCTestMemCheckHandler.cxx |9 +
2 files changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-3887-g22cd130
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 22cd13005088eae3fbec2cee413113f614c70c9f (commit)
via 99381423f6411f73d798354d13ef1584ec24cf8c (commit)
from c0508c48707236c275d13a07f92cfd53227ce915 (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=22cd13005088eae3fbec2cee413113f614c70c9f
commit 22cd13005088eae3fbec2cee413113f614c70c9f
Merge: c0508c4 9938142
Author: Bill Hoffman
AuthorDate: Tue Jun 24 13:38:12 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Jun 24 13:38:12 2014 -0400
Merge topic 'launcher-limit-warnings-errors' into next
99381423 Teach the launcher code to honer the max warnings and errors.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99381423f6411f73d798354d13ef1584ec24cf8c
commit 99381423f6411f73d798354d13ef1584ec24cf8c
Author: Bill Hoffman
AuthorDate: Tue Jun 24 13:35:35 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Jun 24 13:35:35 2014 -0400
Teach the launcher code to honer the max warnings and errors.
The ctest launcher code did not respect the number of errors
and warnings limits. This patch fixes that.
diff --git a/Source/CTest/cmCTestBuildHandler.cxx
b/Source/CTest/cmCTestBuildHandler.cxx
index 7922c9a..2ec1365 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -605,6 +605,9 @@ void cmCTestBuildHandler::GenerateXMLLaunched(std::ostream&
os)
typedef std::set Fragments;
Fragments fragments(fragmentCompare);
+ // only report the first 50 warnings and first 50 errors
+ int numErrorsAllowed = this->MaxErrors;
+ int numWarningsAllowed = this->MaxWarnings;
// Identify fragments on disk.
cmsys::Directory launchDir;
launchDir.Load(this->CTestLaunchDir.c_str());
@@ -612,13 +615,15 @@ void
cmCTestBuildHandler::GenerateXMLLaunched(std::ostream& os)
for(unsigned long i=0; i < n; ++i)
{
const char* fname = launchDir.GetFile(i);
-if(this->IsLaunchedErrorFile(fname))
+if(this->IsLaunchedErrorFile(fname) && numErrorsAllowed)
{
+ numErrorsAllowed--;
fragments.insert(this->CTestLaunchDir + "/" + fname);
++this->TotalErrors;
}
-else if(this->IsLaunchedWarningFile(fname))
+else if(this->IsLaunchedWarningFile(fname) && numWarningsAllowed)
{
+ numWarningsAllowed--;
fragments.insert(this->CTestLaunchDir + "/" + fname);
++this->TotalWarnings;
}
---
Summary of changes:
Source/CTest/cmCTestBuildHandler.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-3893-g46c5c81
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 46c5c81d73cf288c85b0027422c89b840bcdb54d (commit)
via 5dbda727329b1e96bd7d3b730480265d1ee2407c (commit)
from 8b3016971d4f574fb8a0a09bfcc288fa0a9b3c60 (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=46c5c81d73cf288c85b0027422c89b840bcdb54d
commit 46c5c81d73cf288c85b0027422c89b840bcdb54d
Merge: 8b30169 5dbda72
Author: Bill Hoffman
AuthorDate: Tue Jun 24 13:50:37 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Jun 24 13:50:37 2014 -0400
Merge topic 'style-fix' into next
5dbda727 Fix bad style in this class. Wrong case and no this pointer.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dbda727329b1e96bd7d3b730480265d1ee2407c
commit 5dbda727329b1e96bd7d3b730480265d1ee2407c
Author: Bill Hoffman
AuthorDate: Tue Jun 24 13:49:05 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Jun 24 13:49:05 2014 -0400
Fix bad style in this class. Wrong case and no this pointer.
This class had a method that started with lower case, and also
was called without this->.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index 09d0ad8..7b50174 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -918,7 +918,7 @@
cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"PostProcessBoundsCheckerTest for : "
<< res.Name << std::endl);
- std::string ofile = testOutputFileName(test);
+ std::string ofile = this->TestOutputFileName(test);
if ( ofile.empty() )
{
return;
@@ -957,7 +957,7 @@
cmCTestMemCheckHandler::PostProcessPurifyTest(cmCTestTestResult& res,
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"PostProcessPurifyTest for : "
<< res.Name << std::endl);
- appendMemTesterOutput(res, test);
+ this->AppendMemTesterOutput(res, test);
}
void
@@ -967,14 +967,14 @@
cmCTestMemCheckHandler::PostProcessValgrindTest(cmCTestTestResult& res,
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"PostProcessValgrindTest for : "
<< res.Name << std::endl);
- appendMemTesterOutput(res, test);
+ this->AppendMemTesterOutput(res, test);
}
void
-cmCTestMemCheckHandler::appendMemTesterOutput(cmCTestTestResult& res,
+cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
int test)
{
- std::string ofile = testOutputFileName(test);
+ std::string ofile = this->TestOutputFileName(test);
if ( ofile.empty() )
{
@@ -996,7 +996,7 @@
cmCTestMemCheckHandler::appendMemTesterOutput(cmCTestTestResult& res,
}
std::string
-cmCTestMemCheckHandler::testOutputFileName(int test)
+cmCTestMemCheckHandler::TestOutputFileName(int test)
{
std::string index;
cmOStringStream stream;
diff --git a/Source/CTest/cmCTestMemCheckHandler.h
b/Source/CTest/cmCTestMemCheckHandler.h
index 0521a48..20a38bb 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -123,11 +123,11 @@ private:
void PostProcessValgrindTest(cmCTestTestResult& res, int test);
///! append MemoryTesterOutputFile to the test log
- void appendMemTesterOutput(cmCTestTestHandler::cmCTestTestResult& res,
+ void AppendMemTesterOutput(cmCTestTestHandler::cmCTestTestResult& res,
int test);
///! generate the output filename for the given test index
- std::string testOutputFileName(int test);
+ std::string TestOutputFileName(int test);
};
#endif
---
Summary of changes:
Source/CTest/cmCTestMemCheckHandler.cxx | 12 ++--
Source/CTest/cmCTestMemCheckHandler.h |4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4144-gf2fb315
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 f2fb31516ac8b563c0305169a95337551b60f016 (commit)
via b83fbc252732d2cc2b579489e788dc0284e34526 (commit)
from 1d7e20ccc0a1a1bc7013dada619e8f6a7a85382a (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=f2fb31516ac8b563c0305169a95337551b60f016
commit f2fb31516ac8b563c0305169a95337551b60f016
Merge: 1d7e20c b83fbc2
Author: Bill Hoffman
AuthorDate: Mon Jul 7 16:20:12 2014 -0400
Commit: CMake Topic Stage
CommitDate: Mon Jul 7 16:20:12 2014 -0400
Merge topic 'thread-sanitizer' into next
b83fbc25 add support for ThreadSanitizer
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b83fbc252732d2cc2b579489e788dc0284e34526
commit b83fbc252732d2cc2b579489e788dc0284e34526
Author: Bill Hoffman
AuthorDate: Mon Jul 7 15:58:02 2014 -0400
Commit: Bill Hoffman
CommitDate: Mon Jul 7 16:18:26 2014 -0400
add support for ThreadSanitizer
This commit adds support for ThreadSanitizer to ctest. ThreadSanitizer
is part of the clang compiler and also gcc 4.8 and later. You have to
compile the code with special flags. Then your code gets the the
ThreadSanitizer ability built into it. To pass options to the
ThreadSanitizer
you use an environment variable. This commit teaches ctest to parse
the output from ThreadSanitizer and send it to CDash.
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 983bf22..05a7b33 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -344,6 +344,7 @@ Variables for CTest
/variable/CTEST_MEMORYCHECK_COMMAND
/variable/CTEST_MEMORYCHECK_COMMAND_OPTIONS
/variable/CTEST_MEMORYCHECK_SUPPRESSIONS_FILE
+ /variable/CTEST_MEMORYCHECK_TYPE
/variable/CTEST_NIGHTLY_START_TIME
/variable/CTEST_P4_CLIENT
/variable/CTEST_P4_COMMAND
diff --git a/Help/variable/CTEST_MEMORYCHECK_TYPE.rst
b/Help/variable/CTEST_MEMORYCHECK_TYPE.rst
new file mode 100644
index 000..f7875da
--- /dev/null
+++ b/Help/variable/CTEST_MEMORYCHECK_TYPE.rst
@@ -0,0 +1,6 @@
+CTEST_MEMORYCHECK_TYPE
+-
+
+Specify the CTest ``MemoryCheckType`` setting
+in a :manual:`ctest(1)` dashboard client script.
+Valid values are Valgrind, Purify, BoundsChecker, and ThreadSanitizer.
diff --git a/Source/CTest/cmCTestMemCheckCommand.cxx
b/Source/CTest/cmCTestMemCheckCommand.cxx
index 535c993..939b4dc 100644
--- a/Source/CTest/cmCTestMemCheckCommand.cxx
+++ b/Source/CTest/cmCTestMemCheckCommand.cxx
@@ -21,6 +21,8 @@ cmCTestGenericHandler*
cmCTestMemCheckCommand::InitializeActualHandler()
= this->CTest->GetInitializedHandler("memcheck");
this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
+"MemoryCheckType", "CTEST_MEMORYCHECK_TYPE");
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND");
this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"MemoryCheckCommandOptions", "CTEST_MEMORYCHECK_COMMAND_OPTIONS");
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index 7b50174..bcf09ad 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -18,6 +18,7 @@
#include
#include
#include
+#include
#include
#include "cmMakefile.h"
#include "cmXMLSafe.h"
@@ -124,60 +125,7 @@ public:
#define BOUNDS_CHECKER_MARKER \
"**##*Begin BOUNDS CHECKER XML**##**"
-//--
-static const char* cmCTestMemCheckResultStrings[] = {
- "ABR",
- "ABW",
- "ABWL",
- "COR",
- "EXU",
- "FFM",
- "FIM",
- "FMM",
- "FMR",
- "FMW",
- "FUM",
- "IPR",
- "IPW",
- "MAF",
- "MLK",
- "MPK",
- "NPR",
- "ODS",
- "PAR",
- "PLK",
- "UMC",
- "UMR",
- 0
-};
-
-//--
-static const char* cmCTestMemCheckResultLongStrings[] = {
- "Threading Problem",
- "ABW",
- "ABWL",
- "COR",
- "EXU",
- "FFM",
- "FIM",
- "Mism
[Cmake-commits] CMake branch, next, updated. v3.0.0-4270-g35318f6
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 35318f60ed0af2b59a4bdb2b781b7af72bb3fc03 (commit)
via 7a82885b41a63f6786489303c44351cbafe9b0c4 (commit)
via 5f8a81b4d7a39007144fd1b0606a7ca3824d5928 (commit)
from 338096a46bdf0c6354b0c6678de6717e386546ab (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=35318f60ed0af2b59a4bdb2b781b7af72bb3fc03
commit 35318f60ed0af2b59a4bdb2b781b7af72bb3fc03
Merge: 338096a 7a82885
Author: Bill Hoffman
AuthorDate: Tue Jul 15 15:09:43 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Jul 15 15:09:43 2014 -0400
Merge topic 'thread-sanitizer' into next
7a82885b Fix MemoryCheckType from ctest -T memcheck.
5f8a81b4 Add support for memory and leak sanitizer.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a82885b41a63f6786489303c44351cbafe9b0c4
commit 7a82885b41a63f6786489303c44351cbafe9b0c4
Author: Bill Hoffman
AuthorDate: Tue Jul 15 14:19:14 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Jul 15 14:19:14 2014 -0400
Fix MemoryCheckType from ctest -T memcheck.
Before this commit, you would have to run ctest -S mode to get
MemoryCheckType to work. This is because CMAKE_COMMAND was not set.
The fix was to use cmSystemTools::GetCMakeCommand instead.
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in
index 68fadf6..0420882 100644
--- a/Modules/DartConfiguration.tcl.in
+++ b/Modules/DartConfiguration.tcl.in
@@ -71,6 +71,7 @@ Compiler: @CMAKE_CXX_COMPILER@
PurifyCommand: @PURIFYCOMMAND@
ValgrindCommand: @VALGRIND_COMMAND@
ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@
+MemoryCheckType: @MEMORYCHECK_TYPE@
MemoryCheckCommand: @MEMORYCHECK_COMMAND@
MemoryCheckCommandOptions: @MEMORYCHECK_COMMAND_OPTIONS@
MemoryCheckSuppressionFile: @MEMORYCHECK_SUPPRESSIONS_FILE@
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index a389359..ed57949 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -346,8 +346,8 @@ void
cmCTestMemCheckHandler::PopulateCustomVectors(cmMakefile *mf)
this->CTest->PopulateCustomVector(mf,
"CTEST_CUSTOM_MEMCHECK_IGNORE",
this->CustomTestsIgnore);
- this->CTest->SetCTestConfigurationFromCMakeVariable(
-mf, "CMakeCommand", "CMAKE_COMMAND");
+ std::string cmake = cmSystemTools::GetCMakeCommand();
+ this->CTest->SetCTestConfiguration("CMakeCommand", cmake.c_str());
}
//--
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f8a81b4d7a39007144fd1b0606a7ca3824d5928
commit 5f8a81b4d7a39007144fd1b0606a7ca3824d5928
Author: Bill Hoffman
AuthorDate: Mon Jul 14 17:01:47 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Jul 15 11:13:09 2014 -0400
Add support for memory and leak sanitizer.
This adds support for memory and leak sanitizers. This is built into
clang and gcc 4.8 and new compilers. It is activated with a -f switch
during compile.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index bcf09ad..a389359 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -45,11 +45,23 @@ static CatToErrorType cmCTestMemCheckBoundsChecker[] = {
{0,0}
};
+static void xmlReportError(int line, const char* msg, void* data)
+{
+ cmCTest* ctest = (cmCTest*)data;
+ cmCTestLog(ctest, ERROR_MESSAGE,
+ "Error parsing XML in stream at line "
+ << line << ": " << msg << std::endl);
+}
+
// parse the xml file containing the results of last BoundsChecker run
class cmBoundsCheckerParser : public cmXMLParser
{
public:
- cmBoundsCheckerParser(cmCTest* c) { this->CTest = c;}
+ cmBoundsCheckerParser(cmCTest* c)
+{
+ this->CTest = c;
+ this->SetErrorCallback(xmlReportError, (void*)c);
+}
void StartElement(const std::string& name, const char** atts)
{
if(name == "MemoryLeak" ||
@@ -361,6 +373,9 @@ void
cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
case cmCTestMemCheckHandler::THREAD_SANITIZER:
os << "ThreadSanitizer";
break;
+case cmCTestMemCheckHandler::ADDRESS_SANITIZER:
+ os << "AddressSanitizer";
+ break;
default:
[Cmake-commits] CMake branch, next, updated. v3.0.0-4356-g0770ae4
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 0770ae418e8744515adad65f0941d3594df239e1 (commit)
via a4d462d6c607d9970885d3a3ca7d879bde2dd333 (commit)
from 0d1ac351bc47e6c8d9e697e730d2abbf68e4f697 (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=0770ae418e8744515adad65f0941d3594df239e1
commit 0770ae418e8744515adad65f0941d3594df239e1
Merge: 0d1ac35 a4d462d
Author: Bill Hoffman
AuthorDate: Thu Jul 17 11:36:20 2014 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jul 17 11:36:20 2014 -0400
Merge topic 'fix_guard_malloc_forbc' into next
a4d462d6 Add checks for malloc guard in the Bounds Checker test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4d462d6c607d9970885d3a3ca7d879bde2dd333
commit a4d462d6c607d9970885d3a3ca7d879bde2dd333
Author: Bill Hoffman
AuthorDate: Thu Jul 17 11:32:48 2014 -0400
Commit: Bill Hoffman
CommitDate: Thu Jul 17 11:32:48 2014 -0400
Add checks for malloc guard in the Bounds Checker test.
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt
b/Tests/CTestTestMemcheck/CMakeLists.txt
index d16d432..710994c 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -225,7 +225,7 @@
set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain
.*${ctest_and_tool_outputs}$")
set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
-PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+ Passed
+[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error
parsing XML in stream at line 1: no element found\n")
+PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+ Passed
+[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of
1\n(.*\n)?${guard_malloc_lines}(\n)*Error parsing XML in stream at line 1: no
element found\n")
set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES
PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file:
${CTEST_ESCAPED_REALPATH_CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n")
---
Summary of changes:
Tests/CTestTestMemcheck/CMakeLists.txt |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4423-gcbd554f
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 cbd554fbd01117866dd11eaac3b0d014d8f4552d (commit)
via f7d62cac79f856c9c7b634ed7f5d2f6030b7ba76 (commit)
via 08bb09a944ecccb5d5f25c847be7b30a70ccf7c4 (commit)
from 2432d11a01cdfce3bfbb8d866a5f3a45f200b8dd (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=cbd554fbd01117866dd11eaac3b0d014d8f4552d
commit cbd554fbd01117866dd11eaac3b0d014d8f4552d
Merge: 2432d11 f7d62ca
Author: Bill Hoffman
AuthorDate: Tue Jul 22 10:54:20 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Jul 22 10:54:20 2014 -0400
Merge topic 'fix_sanitizer_test_to_work_with_sanitizer' into next
f7d62cac Fix leak and address sanitizer tests to be able to run with real
tools.
08bb09a9 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7d62cac79f856c9c7b634ed7f5d2f6030b7ba76
commit f7d62cac79f856c9c7b634ed7f5d2f6030b7ba76
Author: Bill Hoffman
AuthorDate: Tue Jul 22 10:51:53 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Jul 22 10:51:53 2014 -0400
Fix leak and address sanitizer tests to be able to run with real tools.
When running CMake under Leak or Address Sanitizer tools, the fake reporting
would get picked up by the outer CMake and reported as leaks and address
failures on the CMake dashboard. This commit makes sure the test only
reports simulated errors when asked to.
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt
b/Tests/CTestTestMemcheck/CMakeLists.txt
index d16d432..0f38431 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -121,7 +121,7 @@ set(CTEST_EXTRA_CODE)
# add LeakSanitizer test
set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5
exitcode=55\")
+"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1 report_bugs=1
history_size=5 exitcode=55\")
")
set(CMAKELISTS_EXTRA_CODE
@@ -136,7 +136,7 @@ set_tests_properties(CTestTestMemcheckDummyLeakSanitizer
PROPERTIES
".*Memory checking results:.*Direct leak - 2.*Indirect leak - 1.*")
# add AddressSanitizer test
set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5
exitcode=55\")
+"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1 report_bugs=1
history_size=5 exitcode=55\")
")
set(CMAKELISTS_EXTRA_CODE
diff --git a/Tests/CTestTestMemcheck/testAddressSanitizer.cmake
b/Tests/CTestTestMemcheck/testAddressSanitizer.cmake
index a359e28..a073151 100644
--- a/Tests/CTestTestMemcheck/testAddressSanitizer.cmake
+++ b/Tests/CTestTestMemcheck/testAddressSanitizer.cmake
@@ -5,6 +5,10 @@ message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE
"$ENV{ASAN_OPTIONS}")
message("LOG_FILE=[${LOG_FILE}]")
+# if we are not asked to simulate address sanitizer don't do it
+if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1")
+ return()
+endif()
# clear the log file
file(REMOVE "${LOG_FILE}.2343")
diff --git a/Tests/CTestTestMemcheck/testLeakSanitizer.cmake
b/Tests/CTestTestMemcheck/testLeakSanitizer.cmake
index ca0a264..d0e38ce 100644
--- a/Tests/CTestTestMemcheck/testLeakSanitizer.cmake
+++ b/Tests/CTestTestMemcheck/testLeakSanitizer.cmake
@@ -4,6 +4,10 @@
message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE
"$ENV{ASAN_OPTIONS}")
message("LOG_FILE=[${LOG_FILE}]")
+# if we are not asked to simulate leak sanitizer don't do it
+if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1")
+ return()
+endif()
# clear the log file
file(REMOVE "${LOG_FILE}.2343")
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Tests/CTestTestMemcheck/CMakeLists.txt |4 ++--
Tests/CTestTestMemcheck/testAddressSanitizer.cmake |4
Tests/CTestTestMemcheck/testLeakSanitizer.cmake|4
4 files changed, 11 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4461-g0bf9d58
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 0bf9d5879e628db98995563428cd3089f4bede3b (commit)
via 57a2df224a4bcf4463937d5e121f917d450c144f (commit)
from c8bae9bacafb95d99f9ebfacf8fdfedbbaf56760 (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=0bf9d5879e628db98995563428cd3089f4bede3b
commit 0bf9d5879e628db98995563428cd3089f4bede3b
Merge: c8bae9b 57a2df2
Author: Bill Hoffman
AuthorDate: Wed Jul 23 11:14:20 2014 -0400
Commit: CMake Topic Stage
CommitDate: Wed Jul 23 11:14:20 2014 -0400
Merge topic 'fix_tar_leaks' into next
57a2df22 Fix memory leaks in extract tar.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57a2df224a4bcf4463937d5e121f917d450c144f
commit 57a2df224a4bcf4463937d5e121f917d450c144f
Author: Bill Hoffman
AuthorDate: Wed Jul 23 11:13:17 2014 -0400
Commit: Bill Hoffman
CommitDate: Wed Jul 23 11:13:17 2014 -0400
Fix memory leaks in extract tar.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 444e143..fbb4416 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1701,6 +1701,8 @@ bool extract_tar(const char* outFileName, bool verbose,
{
cmSystemTools::Error("Problem with archive_read_open_file(): ",
archive_error_string(a));
+archive_write_free(ext);
+archive_read_close(a);
return false;
}
for (;;)
@@ -1776,6 +1778,7 @@ bool extract_tar(const char* outFileName, bool verbose,
}
}
}
+ archive_write_free(ext);
archive_read_close(a);
archive_read_finish(a);
return r == ARCHIVE_EOF || r == ARCHIVE_OK;
---
Summary of changes:
Source/cmSystemTools.cxx |3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4488-gcefe04f
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 cefe04f03d6888be7a80509225f2f6f509d445a6 (commit)
via 5d40d88e0026824e237938a9e771206220857034 (commit)
via afe21fc3c43af0c031a77b3b48041d35f248f481 (commit)
from 6ea3b0d99f179a85fc432a7e710bf2857fc5f7a5 (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=cefe04f03d6888be7a80509225f2f6f509d445a6
commit cefe04f03d6888be7a80509225f2f6f509d445a6
Merge: 6ea3b0d 5d40d88
Author: Bill Hoffman
AuthorDate: Thu Jul 24 11:32:04 2014 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jul 24 11:32:04 2014 -0400
Merge topic 'sanitizer_handle_more_pids' into next
5d40d88e Handle more than one process with sanitizer errors.
afe21fc3 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d40d88e0026824e237938a9e771206220857034
commit 5d40d88e0026824e237938a9e771206220857034
Author: Bill Hoffman
AuthorDate: Thu Jul 24 11:25:59 2014 -0400
Commit: Bill Hoffman
CommitDate: Thu Jul 24 11:25:59 2014 -0400
Handle more than one process with sanitizer errors.
Since the Sanitizers write out one log file per process, a single
test might have more than one log file. This commit allows ctest
to read all of the log files found for a particual test.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index ed57949..ced7982 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -1127,7 +1127,13 @@
cmCTestMemCheckHandler::PostProcessTest(cmCTestTestResult& res,
}
else
{
-this->AppendMemTesterOutput(res, test);
+std::vector files;
+this->TestOutputFileNames(test, files);
+for(std::vector::iterator i = files.begin();
+i != files.end(); ++i)
+ {
+ this->AppendMemTesterOutput(res, *i);
+ }
}
}
@@ -1141,11 +1147,13 @@
cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"PostProcessBoundsCheckerTest for : "
<< res.Name << std::endl);
- std::string ofile = this->TestOutputFileName(test);
- if ( ofile.empty() )
+ std::vector files;
+ this->TestOutputFileNames(test, files);
+ if ( files.size() == 0 )
{
return;
}
+ std::string ofile = files[0];
// put a scope around this to close ifs so the file can be removed
{
cmsys::ifstream ifs(ofile.c_str());
@@ -1175,9 +1183,8 @@
cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
void
cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
- int test)
+ std::string const& ofile)
{
- std::string ofile = this->TestOutputFileName(test);
if ( ofile.empty() )
{
return;
@@ -1205,8 +1212,9 @@
cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
}
}
-std::string
-cmCTestMemCheckHandler::TestOutputFileName(int test)
+void cmCTestMemCheckHandler::TestOutputFileNames(int test,
+ std::vector&
+ files)
{
std::string index;
cmOStringStream stream;
@@ -1229,7 +1237,8 @@ cmCTestMemCheckHandler::TestOutputFileName(int test)
}
else
{
- ofile = g.GetFiles()[0];
+ files = g.GetFiles();
+ return;
}
}
else if ( !cmSystemTools::FileExists(ofile.c_str()) )
@@ -1239,5 +1248,5 @@ cmCTestMemCheckHandler::TestOutputFileName(int test)
cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
ofile = "";
}
- return ofile;
+ files.push_back(ofile);
}
diff --git a/Source/CTest/cmCTestMemCheckHandler.h
b/Source/CTest/cmCTestMemCheckHandler.h
index 2630fde..2195dab 100644
--- a/Source/CTest/cmCTestMemCheckHandler.h
+++ b/Source/CTest/cmCTestMemCheckHandler.h
@@ -145,10 +145,10 @@ private:
///! append MemoryTesterOutputFile to the test log
void AppendMemTesterOutput(cmCTestTestHandler::cmCTestTestResult& res,
- int test);
+ std::string const& filename);
///! generate the output filename for the given test index
- std::string TestOutputFileName(int test);
+ void TestOutputFileNames(int test, std::vector& files);
};
#endif
diff --git a/Tests/CTestTestMemcheck/testLeakSani
[Cmake-commits] CMake branch, next, updated. v3.0.0-4490-g807661b
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 807661bce77368f303b4b5b95f41fd2c4e3131f2 (commit) via 0e88b1d6d92b32b767dff33109855f079a272f00 (commit) from cefe04f03d6888be7a80509225f2f6f509d445a6 (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=807661bce77368f303b4b5b95f41fd2c4e3131f2 commit 807661bce77368f303b4b5b95f41fd2c4e3131f2 Merge: cefe04f 0e88b1d Author: Bill Hoffman AuthorDate: Thu Jul 24 11:34:48 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Jul 24 11:34:48 2014 -0400 Merge topic 'fix_qt4_automoc_leak' into next 0e88b1d6 Fix memory leak of local generator detected by LeakSanitizer. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e88b1d6d92b32b767dff33109855f079a272f00 commit 0e88b1d6d92b32b767dff33109855f079a272f00 Author: Bill Hoffman AuthorDate: Thu Jul 24 11:33:54 2014 -0400 Commit: Bill Hoffman CommitDate: Thu Jul 24 11:33:54 2014 -0400 Fix memory leak of local generator detected by LeakSanitizer. diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index cc6932d..d4d565c 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1000,6 +1000,7 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, this->WriteOldMocDefinitionsFile(targetDirectory); + delete gg->GetCurrentLocalGenerator(); delete gg; gg = NULL; makefile = NULL; --- Summary of changes: Source/cmQtAutoGenerators.cxx |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4753-ge951857
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 e951857e6a54a6920e4ab9d198c4d6a4612285bd (commit)
via 7762fffa238a9bbc28658742792c25c10a7cc9c5 (commit)
from f1971971c9c23f1d2819d64e189ce01a15362ac4 (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=e951857e6a54a6920e4ab9d198c4d6a4612285bd
commit e951857e6a54a6920e4ab9d198c4d6a4612285bd
Merge: f197197 7762fff
Author: Bill Hoffman
AuthorDate: Mon Aug 4 15:20:39 2014 -0400
Commit: CMake Topic Stage
CommitDate: Mon Aug 4 15:20:39 2014 -0400
Merge topic 'pass_output_by_reference' into next
7762fffa Change output to be a reference and not a pointer.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7762fffa238a9bbc28658742792c25c10a7cc9c5
commit 7762fffa238a9bbc28658742792c25c10a7cc9c5
Author: Bill Hoffman
AuthorDate: Mon Aug 4 15:16:40 2014 -0400
Commit: Bill Hoffman
CommitDate: Mon Aug 4 15:16:40 2014 -0400
Change output to be a reference and not a pointer.
This avoids having to check the pointer value at each use which
was not being done.
diff --git a/Source/CTest/cmCTestConfigureHandler.cxx
b/Source/CTest/cmCTestConfigureHandler.cxx
index a6e39a4..c492bf0 100644
--- a/Source/CTest/cmCTestConfigureHandler.cxx
+++ b/Source/CTest/cmCTestConfigureHandler.cxx
@@ -77,7 +77,7 @@ int cmCTestConfigureHandler::ProcessHandler()
this->StartLogFile("Configure", ofs);
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Configure with command: "
<< cCommand << std::endl);
-res = this->CTest->RunMakeCommand(cCommand.c_str(), &output,
+res = this->CTest->RunMakeCommand(cCommand.c_str(), output,
&retVal, buildDirectory.c_str(),
0, ofs);
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index d797d3b..b28f3b5 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1147,7 +1147,7 @@ int cmCTest::GetTestModelFromString(const char* str)
//##
//--
-int cmCTest::RunMakeCommand(const char* command, std::string* output,
+int cmCTest::RunMakeCommand(const char* command, std::string& output,
int* retVal, const char* dir, int timeout, std::ostream& ofs)
{
// First generate the command and arguments
@@ -1166,11 +1166,7 @@ int cmCTest::RunMakeCommand(const char* command,
std::string* output,
}
argv.push_back(0);
- if ( output )
-{
-*output = "";
-}
-
+ output = "";
cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, "Run command:");
std::vector::iterator ait;
for ( ait = argv.begin(); ait != argv.end() && *ait; ++ ait )
@@ -1199,27 +1195,25 @@ int cmCTest::RunMakeCommand(const char* command,
std::string* output,
<< "" << std::flush);
while(cmsysProcess_WaitForData(cp, &data, &length, 0))
{
-if ( output )
+for(int cc =0; cc < length; ++cc)
{
- for(int cc =0; cc < length; ++cc)
+ if(data[cc] == 0)
{
-if(data[cc] == 0)
- {
- data[cc] = '\n';
- }
+data[cc] = '\n';
}
-
- output->append(data, length);
- while ( output->size() > (tick * tick_len) )
+ }
+output.append(data, length);
+while ( output.size() > (tick * tick_len) )
+ {
+ tick ++;
+ cmCTestLog(this, HANDLER_OUTPUT, "." << std::flush);
+ if ( tick % tick_line_len == 0 && tick > 0 )
{
-tick ++;
-cmCTestLog(this, HANDLER_OUTPUT, "." << std::flush);
-if ( tick % tick_line_len == 0 && tick > 0 )
- {
- cmCTestLog(this, HANDLER_OUTPUT, " Size: "
-<< int((double(output->size()) / 1024.0) + 1) << "K" << std::endl
-<< "" << std::flush);
- }
+cmCTestLog(this, HANDLER_OUTPUT,
+ " Size: "
+ << int((double(output.size()) / 1024.0) + 1)
+ << "K" << std::endl
+ << "" << std::flush);
}
}
cmCTestLog(this, HANDLER_VERBOSE_OUTPUT, cmCTestLogWrite(data, length));
@@ -1229,7 +1223,7 @@ int cmCTest::RunMakeCommand(const char* command,
std::string* output,
}
[Cmake-commits] CMake branch, next, updated. v3.0.0-4755-ge9a8991
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 e9a89912e887da393c818d0fc2a84c6798fcfe2e (commit)
via b35a7730ce8c6ce853d359654d436334c452aec6 (commit)
from e951857e6a54a6920e4ab9d198c4d6a4612285bd (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=e9a89912e887da393c818d0fc2a84c6798fcfe2e
commit e9a89912e887da393c818d0fc2a84c6798fcfe2e
Merge: e951857 b35a773
Author: Bill Hoffman
AuthorDate: Mon Aug 4 15:34:28 2014 -0400
Commit: CMake Topic Stage
CommitDate: Mon Aug 4 15:34:28 2014 -0400
Merge topic 'fix_truncation_logic_valgrind_output' into next
b35a7730 Fix truncation of valgrind output logic.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b35a7730ce8c6ce853d359654d436334c452aec6
commit b35a7730ce8c6ce853d359654d436334c452aec6
Author: Bill Hoffman
AuthorDate: Mon Aug 4 15:28:48 2014 -0400
Commit: Bill Hoffman
CommitDate: Mon Aug 4 15:28:48 2014 -0400
Fix truncation of valgrind output logic.
This showed up because scan-build noticed outputFull was basically
a constant. Logic should be output all valgrind output. Then output
regular test output until output limit is reached.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index ced7982..a7ab077 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -932,7 +932,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
double sttime = cmSystemTools::GetTime();
cmCTestLog(this->CTest, DEBUG, "Start test: " << lines.size() << std::endl);
std::string::size_type totalOutputSize = 0;
- bool outputFull = false;
for ( cc = 0; cc < lines.size(); cc ++ )
{
cmCTestLog(this->CTest, DEBUG, "test line "
@@ -1019,32 +1018,30 @@ bool
cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
}
}
// Now put all all the non valgrind output into the test output
- if(!outputFull)
+ // This should be last in case it gets truncated by the output
+ // limiting code
+ for(std::vector::iterator i =
+nonValGrindOutput.begin(); i != nonValGrindOutput.end(); ++i)
{
-for(std::vector::iterator i =
- nonValGrindOutput.begin(); i != nonValGrindOutput.end(); ++i)
+totalOutputSize += lines[*i].size();
+cmCTestLog(this->CTest, DEBUG, "before xml safe "
+ << lines[*i] << std::endl);
+cmCTestLog(this->CTest, DEBUG, "after xml safe "
+ << cmXMLSafe(lines[*i]) << std::endl);
+ostr << cmXMLSafe(lines[*i]) << std::endl;
+if(!unlimitedOutput && totalOutputSize >
+ static_cast(this->CustomMaximumFailedTestOutputSize))
{
- totalOutputSize += lines[*i].size();
- cmCTestLog(this->CTest, DEBUG, "before xml safe "
- << lines[*i] << std::endl);
- cmCTestLog(this->CTest, DEBUG, "after xml safe "
- << cmXMLSafe(lines[*i]) << std::endl);
-
- ostr << cmXMLSafe(lines[*i]) << std::endl;
- if(!unlimitedOutput && totalOutputSize >
- static_cast(this->CustomMaximumFailedTestOutputSize))
-{
-outputFull = true;
-ostr << "\n";
-ostr << "Test Output for this test has been truncated see testing"
- " machine logs for full output,\n";
-ostr << "or put CTEST_FULL_OUTPUT in the output of "
- "this test program.\n";
-}
+ ostr << "\n";
+ ostr << "Test Output for this test has been truncated see testing"
+" machine logs for full output,\n";
+ ostr << "or put CTEST_FULL_OUTPUT in the output of "
+"this test program.\n";
+ break; // stop the copy of output if we are full
}
}
cmCTestLog(this->CTest, DEBUG, "End test (elapsed: "
-<< (cmSystemTools::GetTime() - sttime) << std::endl);
+ << (cmSystemTools::GetTime() - sttime) << std::endl);
log = ostr.str();
if ( defects )
{
---
Summary of changes:
Source/CTest/cmCTestMemCheckHandler.cxx | 41 ++-
1 file changed, 19 insertions(+), 22 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4757-gaa373eb
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 aa373eb723dc596e8b129a6b2f279df27f6d3dda (commit)
via aea40fcb43f3b3496c79948e4e4fe08dbe4086d5 (commit)
from e9a89912e887da393c818d0fc2a84c6798fcfe2e (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=aa373eb723dc596e8b129a6b2f279df27f6d3dda
commit aa373eb723dc596e8b129a6b2f279df27f6d3dda
Merge: e9a8991 aea40fc
Author: Bill Hoffman
AuthorDate: Mon Aug 4 15:39:39 2014 -0400
Commit: CMake Topic Stage
CommitDate: Mon Aug 4 15:39:39 2014 -0400
Merge topic 'fix_value_not_used' into next
aea40fcb Fix scan-build warning parsed is never read after being set.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aea40fcb43f3b3496c79948e4e4fe08dbe4086d5
commit aea40fcb43f3b3496c79948e4e4fe08dbe4086d5
Author: Bill Hoffman
AuthorDate: Mon Aug 4 15:38:56 2014 -0400
Commit: Bill Hoffman
CommitDate: Mon Aug 4 15:38:56 2014 -0400
Fix scan-build warning parsed is never read after being set.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 98c62d5..c57028d 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -343,7 +343,6 @@ int main (int argc, char const* const* argv)
{
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"CPack generator not specified" << std::endl);
- parsed = 0;
}
else
{
---
Summary of changes:
Source/CPack/cpack.cxx |1 -
1 file changed, 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-4781-g9f19254
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 9f192548e1f7d046b25927469f351ad8542568f8 (commit)
via 2cac483e64835329e4eec2d2fad5001895d0e7fe (commit)
from ca5ec0de3af93edcbaf5b79026b57fadf16bd123 (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=9f192548e1f7d046b25927469f351ad8542568f8
commit 9f192548e1f7d046b25927469f351ad8542568f8
Merge: ca5ec0d 2cac483
Author: Bill Hoffman
AuthorDate: Tue Aug 5 10:28:01 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Aug 5 10:28:01 2014 -0400
Merge topic 'fix_value_not_used' into next
2cac483e Fix used value warning.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cac483e64835329e4eec2d2fad5001895d0e7fe
commit 2cac483e64835329e4eec2d2fad5001895d0e7fe
Author: Bill Hoffman
AuthorDate: Tue Aug 5 10:22:36 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Aug 5 10:22:36 2014 -0400
Fix used value warning.
packageFileName no longer has only one value in this function. Move the
declaration into the loop and remove its initial and unused asignment.
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 9336bed..1461bb1 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1049,7 +1049,6 @@ int cmCPackGenerator::DoPackage()
const char* tempPackageFileName = this->GetOption(
"CPACK_TEMPORARY_PACKAGE_FILE_NAME");
- const char* packageFileName = this->GetOption("CPACK_OUTPUT_FILE_PATH");
const char* tempDirectory = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Find files" << std::endl);
@@ -1114,7 +1113,7 @@ int cmCPackGenerator::DoPackage()
std::string tmpPF(this->GetOption("CPACK_OUTPUT_FILE_PREFIX"));
tempPackageFileName = it->c_str();
tmpPF += "/"+cmSystemTools::GetFilenameName(*it);
-packageFileName = tmpPF.c_str();
+const char* packageFileName = tmpPF.c_str();
cmCPackLogger(cmCPackLog::LOG_DEBUG, "Copy final package(s): "
<< (tempPackageFileName ? tempPackageFileName : "(NULL)" )
<< " to "
---
Summary of changes:
Source/CPack/cmCPackGenerator.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.1-4902-g427f096
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 427f096751763b1b94e4303d27713e8ce3ca06ec (commit)
via e18ed0310aad64708dc01ce7d66f262aa1bf4683 (commit)
from 5c047211a5e933fd4d30a2956800742686464c97 (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=427f096751763b1b94e4303d27713e8ce3ca06ec
commit 427f096751763b1b94e4303d27713e8ce3ca06ec
Merge: 5c04721 e18ed03
Author: Bill Hoffman
AuthorDate: Wed Aug 13 13:54:14 2014 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 13 13:54:14 2014 -0400
Merge topic 'ctest_update_status_only' into next
e18ed031 Teach ctest_update to only note the version via
CTEST_UPDATE_VERSION_ONLY var.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e18ed0310aad64708dc01ce7d66f262aa1bf4683
commit e18ed0310aad64708dc01ce7d66f262aa1bf4683
Author: Bill Hoffman
AuthorDate: Wed Aug 13 13:45:08 2014 -0400
Commit: Bill Hoffman
CommitDate: Wed Aug 13 13:45:08 2014 -0400
Teach ctest_update to only note the version via CTEST_UPDATE_VERSION_ONLY
var.
This allows ctest_update to get the current version without actually
changing
the repository. This is useful when using jenkins or an external
project to update the source to a specific version, but you still want
the current version to show up in CDash.
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index a57a8f0..52e4beb 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -668,6 +668,15 @@ Configuration settings to specify the version control tool
include:
* :module:`CTest` module variable: ``UPDATE_TYPE`` if set,
else ``CTEST_UPDATE_TYPE``
+``UpdateVersionOnly``
+ Specify that you want the version control update command to only
+ discover the current version that is checked out, and not to update
+ to a different version.
+
+ * `CTest Script`_ variable: :variable:`CTEST_UPDATE_VERSION_ONLY`
+
+
+
Additional configuration settings include:
``NightlyStartTime``
diff --git a/Help/variable/CTEST_UPDATE_VERSION_ONLY.rst
b/Help/variable/CTEST_UPDATE_VERSION_ONLY.rst
new file mode 100644
index 000..3665147
--- /dev/null
+++ b/Help/variable/CTEST_UPDATE_VERSION_ONLY.rst
@@ -0,0 +1,5 @@
+CTEST_UPDATE_VERSION_ONLY
+
+
+Specify the CTest ``UpdateVersionOnly`` setting
+in a :manual:`ctest(1)` dashboard client script.
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in
index 0420882..86049d0 100644
--- a/Modules/DartConfiguration.tcl.in
+++ b/Modules/DartConfiguration.tcl.in
@@ -37,6 +37,9 @@ ConfigureCommand: "@CMAKE_COMMAND@" "@PROJECT_SOURCE_DIR@"
MakeCommand: @MAKECOMMAND@
DefaultCTestConfigurationType: @DEFAULT_CTEST_CONFIGURATION_TYPE@
+# version control
+UpdateVersionOnly: @CTEST_UPDATE_VERSION_ONLY@
+
# CVS options
# Default is "-d -P -A"
CVSCommand: @CVSCOMMAND@
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx
b/Source/CTest/cmCTestUpdateCommand.cxx
index 5408a8a..f87466d 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -56,6 +56,8 @@ cmCTestGenericHandler*
cmCTestUpdateCommand::InitializeHandler()
this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"GITUpdateCustom", "CTEST_GIT_UPDATE_CUSTOM");
this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
+"UpdateVersionOnly", "CTEST_UPDATE_VERSION_ONLY");
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"HGCommand", "CTEST_HG_COMMAND");
this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"HGUpdateOptions", "CTEST_HG_UPDATE_OPTIONS");
diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx
index f89fa2b..15f796f 100644
--- a/Source/CTest/cmCTestVC.cxx
+++ b/Source/CTest/cmCTestVC.cxx
@@ -166,10 +166,17 @@ void cmCTestVC::CleanupImpl()
//
bool cmCTestVC::Update()
{
- this->NoteOldRevision();
- this->Log << "--- Begin Update ---\n";
- bool result = this->UpdateImpl();
- this->Log << "--- End Update ---\n";
+ bool result = true;
+ // if update version only is on then do not actually update,
+ // just note the current version and finish
+ if(!cmSystemTools::IsOn(
+ this->CTest->GetCTestConfiguration("UpdateVersionOnly").c_str()))
+
[Cmake-commits] CMake branch, next, updated. v3.0.1-4908-g3a3bdd2
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 3a3bdd27d79a9f732a7afe90b2b705b1b0f57ea6 (commit)
via e4f8f454c789fff8bf9e89de4159b54646084731 (commit)
from 3b10600e60b9f24bea1bcfbca0dda5a93ecc9085 (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=3a3bdd27d79a9f732a7afe90b2b705b1b0f57ea6
commit 3a3bdd27d79a9f732a7afe90b2b705b1b0f57ea6
Merge: 3b10600 e4f8f45
Author: Bill Hoffman
AuthorDate: Wed Aug 13 18:01:29 2014 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 13 18:01:29 2014 -0400
Merge topic 'ctest_update_status_only' into next
e4f8f454 Allow / to be in the build name, and be consistent with the build
name.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4f8f454c789fff8bf9e89de4159b54646084731
commit e4f8f454c789fff8bf9e89de4159b54646084731
Author: Bill Hoffman
AuthorDate: Wed Aug 13 17:58:05 2014 -0400
Commit: Bill Hoffman
CommitDate: Wed Aug 13 17:58:05 2014 -0400
Allow / to be in the build name, and be consistent with the build name.
Prior to this change / was not allowed in the build name. This was tested
with a CDash server and worked. In addition the safe build name was not
used everywhere. This caused mismatched build names to be in the xml
files going to CDash which caused different rows to be created for the
same build.
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx
b/Source/CTest/cmCTestSubmitHandler.cxx
index 109905c..06fcb75 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -1479,8 +1479,10 @@ int cmCTestSubmitHandler::ProcessHandler()
//
std::string cmCTestSubmitHandler::GetSubmitResultsPrefix()
{
+ std::string buildname = cmCTest::SafeBuildIdField(
+this->CTest->GetCTestConfiguration("BuildName"));
std::string name = this->CTest->GetCTestConfiguration("Site") +
-"___" + this->CTest->GetCTestConfiguration("BuildName") +
+"___" + buildname +
"___" + this->CTest->GetCurrentTag() + "-" +
this->CTest->GetTestModelString() + "___XML___";
return name;
diff --git a/Source/CTest/cmCTestUpdateHandler.cxx
b/Source/CTest/cmCTestUpdateHandler.cxx
index fda61ea..68f5fe1 100644
--- a/Source/CTest/cmCTestUpdateHandler.cxx
+++ b/Source/CTest/cmCTestUpdateHandler.cxx
@@ -258,12 +258,13 @@ int cmCTestUpdateHandler::ProcessHandler()
double elapsed_time_start = cmSystemTools::GetTime();
bool updated = vc->Update();
-
+ std::string buildname = cmCTest::SafeBuildIdField(
+this->CTest->GetCTestConfiguration("BuildName"));
os << "\n"
<< "\n"
<< "\t" << this->CTest->GetCTestConfiguration("Site") << "\n"
-<< "\t" << this->CTest->GetCTestConfiguration("BuildName")
+<< "\t" << buildname
<< "\n"
<< "\t" << this->CTest->GetCurrentTag() << "-"
<< this->CTest->GetTestModelString() << "" << std::endl;
diff --git a/Source/CTest/cmCTestUploadHandler.cxx
b/Source/CTest/cmCTestUploadHandler.cxx
index 4c3f81b..e33c387 100644
--- a/Source/CTest/cmCTestUploadHandler.cxx
+++ b/Source/CTest/cmCTestUploadHandler.cxx
@@ -44,14 +44,15 @@ int cmCTestUploadHandler::ProcessHandler()
"Cannot open Upload.xml file" << std::endl);
return -1;
}
-
+ std::string buildname = cmCTest::SafeBuildIdField(
+this->CTest->GetCTestConfiguration("BuildName"));
cmCTest::SetOfStrings::const_iterator it;
ofs << "\n"
<< " \"?>\n"
<< "CTest->GetCTestConfiguration("BuildName")
+ << buildname
<< "\" BuildStamp=\""
<< this->CTest->GetCurrentTag() << "-"
<< this->CTest->GetTestModelString() << "\" Name=\""
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index b28f3b5..a7905a4 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -488,9 +488,11 @@ int cmCTest::Initialize(const char* binary_dir,
cmCTestStartCommand* command)
{
cmCTestLog(this, DEBUG, "Here: " << __LINE__ << std::e
[Cmake-commits] CMake branch, next, updated. v3.0.1-4910-g1bfdb1d
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 1bfdb1deb286a6dd148797f4141b930847877639 (commit)
via 1bb4b94a1f8a4d3a2ba96861b91f59ff2dde73aa (commit)
from 3a3bdd27d79a9f732a7afe90b2b705b1b0f57ea6 (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=1bfdb1deb286a6dd148797f4141b930847877639
commit 1bfdb1deb286a6dd148797f4141b930847877639
Merge: 3a3bdd2 1bb4b94
Author: Bill Hoffman
AuthorDate: Wed Aug 13 18:04:21 2014 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 13 18:04:21 2014 -0400
Merge topic 'ctest_update_status_only' into next
1bb4b94a Put cygwin exclude back in.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bb4b94a1f8a4d3a2ba96861b91f59ff2dde73aa
commit 1bb4b94a1f8a4d3a2ba96861b91f59ff2dde73aa
Author: Bill Hoffman
AuthorDate: Wed Aug 13 18:03:58 2014 -0400
Commit: Bill Hoffman
CommitDate: Wed Aug 13 18:03:58 2014 -0400
Put cygwin exclude back in.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d36f3ac..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2012,9 +2012,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
mark_as_advanced(GIT_EXECUTABLE)
set(CTEST_TEST_UPDATE_GIT 0)
if(GIT_EXECUTABLE)
-# if(NOT "${GIT_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
+ if(NOT "${GIT_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
set(CTEST_TEST_UPDATE_GIT 1)
-# endif()
+ endif()
endif()
if(CTEST_TEST_UPDATE_GIT)
set(CTestUpdateGIT_DIR "CTest UpdateGIT")
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5426-g752fcae
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 752fcaede3b811298a07b3326d22bd9bf1f77631 (commit)
via 55a885da00985823253827e2e44f9e02f2999b71 (commit)
via 069090e347078d1e3998e13e49d2d50dae013ef0 (commit)
from 2e5042a2523a1747cbc86f5febef6b76c8a40b1b (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=752fcaede3b811298a07b3326d22bd9bf1f77631
commit 752fcaede3b811298a07b3326d22bd9bf1f77631
Merge: 2e5042a 55a885d
Author: Bill Hoffman
AuthorDate: Tue Sep 23 11:02:07 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 23 11:02:07 2014 -0400
Merge topic 'fix_search_path_ios_trycompile' into next
55a885da Teach try_compile COPY_FILE to look for IOS app bundles.
069090e3 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55a885da00985823253827e2e44f9e02f2999b71
commit 55a885da00985823253827e2e44f9e02f2999b71
Author: Bill Hoffman
AuthorDate: Tue Sep 23 10:59:08 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Sep 23 10:59:08 2014 -0400
Teach try_compile COPY_FILE to look for IOS app bundles.
The COPY_FILE option on try_compile never looked for IOS application
bundles. This caused it to fail if the CMAKE_MACOSX_BUNDLE was set.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index ed19851..bc5708d 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -634,6 +634,10 @@ void cmCoreTryCompile::FindOutputFile(const std::string&
targetName)
searchDirs.push_back(tmp);
}
searchDirs.push_back("/Debug");
+#if defined(__APPLE__)
+ std::string app = "/Debug/" + targetName + ".app";
+ searchDirs.push_back(app);
+#endif
searchDirs.push_back("/Development");
for(std::vector::const_iterator it = searchDirs.begin();
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmCoreTryCompile.cxx |4
2 files changed, 5 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5644-gc46d0c6
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 c46d0c630c080f479f53b5a5103bd81b25c922c9 (commit)
via 0cd0674c262376fe072b317d62247bdaa03dee43 (commit)
via 90414910438ef4adf1c778dd658813d9750f96fe (commit)
via 90f747ddf27fe72d04e3dd5e86437abc69477f98 (commit)
from fb79547b09afa0f0f16690afc89aa17b639c5df2 (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=c46d0c630c080f479f53b5a5103bd81b25c922c9
commit c46d0c630c080f479f53b5a5103bd81b25c922c9
Merge: fb79547 0cd0674
Author: Bill Hoffman
AuthorDate: Tue Oct 7 14:09:44 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 7 14:09:44 2014 -0400
Merge topic 'msan-support' into next
0cd0674c Merge topic 'ubsan-support' into msan-support
90414910 Add testing to memory sanitizer.
90f747dd add support for MemorySanitizer msan.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cd0674c262376fe072b317d62247bdaa03dee43
commit 0cd0674c262376fe072b317d62247bdaa03dee43
Merge: 9041491 51ec99a
Author: Bill Hoffman
AuthorDate: Tue Oct 7 14:09:00 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Oct 7 14:09:00 2014 -0400
Merge topic 'ubsan-support' into msan-support
Conflicts:
Source/CTest/cmCTestMemCheckHandler.cxx
Source/CTest/cmCTestMemCheckHandler.h
Tests/CTestTestMemcheck/CMakeLists.txt
diff --cc Source/CTest/cmCTestMemCheckHandler.cxx
index 0fc4cbf,8558298..d444b9b
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@@ -376,9 -376,9 +376,12 @@@ void cmCTestMemCheckHandler::GenerateDa
case cmCTestMemCheckHandler::ADDRESS_SANITIZER:
os << "AddressSanitizer";
break;
+case cmCTestMemCheckHandler::MEMORY_SANITIZER:
+ os << "MemorySanitizer";
+ break;
+ case cmCTestMemCheckHandler::UB_SANITIZER:
+ os << "UndefinedBehaviorSanitizer";
+ break;
default:
os << "Unknown";
}
@@@ -556,13 -556,13 +559,21 @@@ bool cmCTestMemCheckHandler::Initialize
this->LogWithPID = true; // even if we give the log file the pid is added
}
if ( this->CTest->GetCTestConfiguration("MemoryCheckType")
+ == "MemorySanitizer")
+{
+this->MemoryTester
+ = this->CTest->GetCTestConfiguration("CMakeCommand").c_str();
+this->MemoryTesterStyle = cmCTestMemCheckHandler::MEMORY_SANITIZER;
+this->LogWithPID = true; // even if we give the log file the pid is added
+}
++ if ( this->CTest->GetCTestConfiguration("MemoryCheckType")
+== "UndefinedBehaviorSanitizer")
+ {
+ this->MemoryTester
+ = this->CTest->GetCTestConfiguration("CMakeCommand").c_str();
+ this->MemoryTesterStyle = cmCTestMemCheckHandler::UB_SANITIZER;
+ this->LogWithPID = true; // even if we give the log file the pid is added
+ }
// Check the MemoryCheckType
if(this->MemoryTesterStyle == cmCTestMemCheckHandler::UNKNOWN)
{
@@@ -685,11 -685,11 +696,12 @@@
this->MemoryTesterOptions.push_back("/M");
break;
}
- // these two are almost the same but the env var used
+ // these three are almost the same but the env var used
// is different
+case cmCTestMemCheckHandler::MEMORY_SANITIZER:
case cmCTestMemCheckHandler::ADDRESS_SANITIZER:
case cmCTestMemCheckHandler::THREAD_SANITIZER:
+ case cmCTestMemCheckHandler::UB_SANITIZER:
{
// To pass arguments to ThreadSanitizer the environment variable
// TSAN_OPTIONS is used. This is done with the cmake -E env command.
@@@ -698,19 -698,25 +710,29 @@@
// TSAN_OPTIONS string with the log_path in it.
this->MemoryTesterDynamicOptions.push_back("-E");
this->MemoryTesterDynamicOptions.push_back("env");
- std::string envVar = "TSAN_OPTIONS";
- std::string extraOptions;
- if(this->MemoryTesterStyle == cmCTestMemCheckHandler::ADDRESS_SANITIZER)
+ std::string envVar;
+ std::string extraOptions =
+ this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
+ if(this->MemoryTesterStyle == cmCTestMemCheckHandler::THREAD_SANITIZER)
+ {
+ envVar = "TSAN_OPTIONS";
+ }
+ else if(this->MemoryTesterStyle ==
+ cmCT
[Cmake-commits] CMake branch, next, updated. v3.0.2-5653-g402c64f
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 402c64f037e55b55e5baabb53ef6ee736306ef0b (commit)
via fbf6635b217265c73a2c7ecf7a022f2692473e3e (commit)
from 2403725e8507400a6c1befe5f0f4006a0e2c0798 (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=402c64f037e55b55e5baabb53ef6ee736306ef0b
commit 402c64f037e55b55e5baabb53ef6ee736306ef0b
Merge: 2403725 fbf6635
Author: Bill Hoffman
AuthorDate: Tue Oct 7 15:13:13 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Oct 7 15:13:13 2014 -0400
Merge topic 'msan-support' into next
fbf6635b add missing file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbf6635b217265c73a2c7ecf7a022f2692473e3e
commit fbf6635b217265c73a2c7ecf7a022f2692473e3e
Author: Bill Hoffman
AuthorDate: Tue Oct 7 15:12:45 2014 -0400
Commit: Bill Hoffman
CommitDate: Tue Oct 7 15:12:45 2014 -0400
add missing file.
diff --git a/Tests/CTestTestMemcheck/testMemorySanitizer.cmake
b/Tests/CTestTestMemcheck/testMemorySanitizer.cmake
new file mode 100644
index 000..c87af9a
--- /dev/null
+++ b/Tests/CTestTestMemcheck/testMemorySanitizer.cmake
@@ -0,0 +1,27 @@
+# this file simulates a program that has been built with thread sanitizer
+# options
+
+message("MSAN_OPTIONS = [$ENV{MSAN_OPTIONS}]")
+string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE
"$ENV{MSAN_OPTIONS}")
+message("LOG_FILE=[${LOG_FILE}]")
+
+# if we are not asked to simulate address sanitizer don't do it
+if(NOT "$ENV{MSAN_OPTIONS}]" MATCHES "simulate_sanitizer.1")
+ return()
+endif()
+# clear the log file
+file(REMOVE "${LOG_FILE}.2343")
+
+# create an error of each type of thread santizer
+# these names come from tsan_report.cc in llvm
+
+file(APPEND "${LOG_FILE}.2343"
+"=
+==28423== WARNING: MemorySanitizer: use-of-uninitialized-value
+#0 0x7f4364210dd9 in main (/home/kitware/msan/msan-bin/umr+0x7bdd9)
+#1 0x7f4362d9376c in __libc_start_main
/build/buildd/eglibc-2.15/csu/libc-start.c:226
+#2 0x7f4364210b0c in _start (/home/kitware/msan/msan-bin/umr+0x7bb0c)
+
+SUMMARY: MemorySanitizer: use-of-uninitialized-value ??:0 main
+Exiting
+")
---
Summary of changes:
Tests/CTestTestMemcheck/testMemorySanitizer.cmake | 27 +
1 file changed, 27 insertions(+)
create mode 100644 Tests/CTestTestMemcheck/testMemorySanitizer.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-222-g74ee264
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 74ee264c0bcd5f5a003cc8e3ebf8f1b38e2ac3e5 (commit)
via 89ae032fb010197715d8308697987421083d604a (commit)
via a8942cd2b555f72c39fdac6df54ecff52d58e975 (commit)
via 24d7e3ea16e7cb687010c03a35621053f8ed74fb (commit)
from c0253804aed4f21ba5b9dede973a59bc65f65e47 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74ee264c0bcd5f5a003cc8e3ebf8f1b38e2ac3e5
commit 74ee264c0bcd5f5a003cc8e3ebf8f1b38e2ac3e5
Merge: c025380 89ae032
Author: Bill Hoffman
AuthorDate: Fri Jun 10 10:31:43 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Jun 10 10:31:43 2016 -0400
Merge topic 'link_what_you_use' into next
89ae032f use inline markup for rst files and call ldd directly
a8942cd2 add documentation for LINK_WHAT_YOU_USE
24d7e3ea Add support for ldd -u -r as link what you use
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89ae032fb010197715d8308697987421083d604a
commit 89ae032fb010197715d8308697987421083d604a
Author: Bill Hoffman
AuthorDate: Thu Jun 9 17:12:13 2016 -0400
Commit: Bill Hoffman
CommitDate: Thu Jun 9 17:12:13 2016 -0400
use inline markup for rst files and call ldd directly
diff --git a/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
b/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
index 76bfafa..32d6edb 100644
--- a/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
+++ b/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
@@ -1,10 +1,10 @@
LINK_WHAT_YOU_USE
---
-This is a boolean option that when set to TRUE will automatically run
-ldd -r -u on the target after it is linked. In addition, the linker flag
--Wl,--no-as-needed will be passed to the target with the link command so that
-all libraries specified on the command line will be linked into the
+This is a boolean option that when set to ``TRUE`` will automatically run
+``ldd -r -u`` on the target after it is linked. In addition, the linker flag
+``-Wl,--no-as-needed`` will be passed to the target with the link command so
+that all libraries specified on the command line will be linked into the
target. This will result in the link producing a list of libraries that
provide no symbols used by this target but are being linked to it.
This is only applicable to executable and shared library targets and
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 4be81e9..8fb91a9 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -307,9 +307,8 @@ if(CMAKE_OSX_ARCHITECTURES AND XCODE AND NOT
"${XCODE_VERSION}" MATCHES "^[^12]"
endif()
if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
- find_program(LDD_PATH ldd)
- if(UNIX AND LDD_PATH)
-execute_process(COMMAND ${LDD_PATH} --help
+ if(UNIX)
+execute_process(COMMAND ldd --help
OUTPUT_VARIABLE LDD_HELP)
if("${LDD_HELP}" MATCHES
"(-r, --function-relocs.*process data and function relocations|-u,
--unused.*print unused direct dependencies)")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8942cd2b555f72c39fdac6df54ecff52d58e975
commit a8942cd2b555f72c39fdac6df54ecff52d58e975
Author: Bill Hoffman
AuthorDate: Thu Jun 9 16:32:24 2016 -0400
Commit: Bill Hoffman
CommitDate: Thu Jun 9 16:32:24 2016 -0400
add documentation for LINK_WHAT_YOU_USE
diff --git a/Help/manual/cmake-properties.7.rst
b/Help/manual/cmake-properties.7.rst
index 3403dcd..6a7560a 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -217,6 +217,7 @@ Properties on Targets
/prop_tgt/LINK_LIBRARIES
/prop_tgt/LINK_SEARCH_END_STATIC
/prop_tgt/LINK_SEARCH_START_STATIC
+ /prop_tgt/LINK_WHAT_YOU_USE
/prop_tgt/LOCATION_CONFIG
/prop_tgt/LOCATION
/prop_tgt/MACOSX_BUNDLE_INFO_PLIST
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 85b8eae..36d00dc 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -275,6 +275,7 @@ Variables that Control the Build
/variable/CMAKE_LINK_INTERFACE_LIBRARIES
/variable/CMAKE_LINK_LIBRARY_FILE_FLAG
/variable/CMAKE_LINK_LIBRARY_FLAG
+ /variable/CMAKE_LINK_WHAT_YOU_USE
/variable/CMAKE_MACOSX_BUNDLE
/variable/CMAKE_MACOSX_RPATH
/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG
diff --git a/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
b/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
new file mode 100644
index 000..76bfafa
--- /dev/null
+++ b/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
@@ -0,0 +1,15 @@
+LINK_WHAT_YOU_US
[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-350-gc3e9f73
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 c3e9f7396581ff316be231fdd85bb0dfd2503596 (commit)
via d0adee7c496d08e8702a378ab841989568cd0f27 (commit)
from 6ba4954cb9787ea034f3f8d56003aad8130e4465 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3e9f7396581ff316be231fdd85bb0dfd2503596
commit c3e9f7396581ff316be231fdd85bb0dfd2503596
Merge: 6ba4954 d0adee7
Author: Bill Hoffman
AuthorDate: Thu Jun 16 14:13:24 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Jun 16 14:13:24 2016 -0400
Merge topic 'link_what_you_use' into next
d0adee7c Add support for ldd -u -r as link what you use tool.
diff --cc Source/cmMakefileExecutableTargetGenerator.cxx
index f2c7bc8,9c34125..ca0fdcb
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@@ -187,10 -187,13 +187,14 @@@ void cmMakefileExecutableTargetGenerato
this->LocalGenerator->AppendFlags(
linkFlags, this->Makefile->GetDefinition(export_flag_var));
}
+ if(this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) {
+ this->LocalGenerator->AppendFlags(linkFlags,
+ " -Wl,--no-as-needed");
+ }
// Add language feature flags.
- this->AddFeatureFlags(flags, linkLanguage);
+ this->LocalGenerator->AddFeatureFlags(flags, linkLanguage,
+this->GeneratorTarget);
this->LocalGenerator->AddArchitectureFlags(flags, this->GeneratorTarget,
linkLanguage, this->ConfigName);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0adee7c496d08e8702a378ab841989568cd0f27
commit d0adee7c496d08e8702a378ab841989568cd0f27
Author: Bill Hoffman
AuthorDate: Thu Jun 2 18:08:30 2016 -0400
Commit: Bill Hoffman
CommitDate: Thu Jun 16 14:12:20 2016 -0400
Add support for ldd -u -r as link what you use tool.
diff --git a/Help/manual/cmake-properties.7.rst
b/Help/manual/cmake-properties.7.rst
index 3403dcd..6a7560a 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -217,6 +217,7 @@ Properties on Targets
/prop_tgt/LINK_LIBRARIES
/prop_tgt/LINK_SEARCH_END_STATIC
/prop_tgt/LINK_SEARCH_START_STATIC
+ /prop_tgt/LINK_WHAT_YOU_USE
/prop_tgt/LOCATION_CONFIG
/prop_tgt/LOCATION
/prop_tgt/MACOSX_BUNDLE_INFO_PLIST
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 85b8eae..36d00dc 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -275,6 +275,7 @@ Variables that Control the Build
/variable/CMAKE_LINK_INTERFACE_LIBRARIES
/variable/CMAKE_LINK_LIBRARY_FILE_FLAG
/variable/CMAKE_LINK_LIBRARY_FLAG
+ /variable/CMAKE_LINK_WHAT_YOU_USE
/variable/CMAKE_MACOSX_BUNDLE
/variable/CMAKE_MACOSX_RPATH
/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG
diff --git a/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
b/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
new file mode 100644
index 000..32d6edb
--- /dev/null
+++ b/Help/prop_tgt/LINK_WHAT_YOU_USE.rst
@@ -0,0 +1,15 @@
+LINK_WHAT_YOU_USE
+---
+
+This is a boolean option that when set to ``TRUE`` will automatically run
+``ldd -r -u`` on the target after it is linked. In addition, the linker flag
+``-Wl,--no-as-needed`` will be passed to the target with the link command so
+that all libraries specified on the command line will be linked into the
+target. This will result in the link producing a list of libraries that
+provide no symbols used by this target but are being linked to it.
+This is only applicable to executable and shared library targets and
+will only work when ld and ldd accept the flags used.
+
+This property is initialized by the value of
+the :variable:`CMAKE_LINK_WHAT_YOU_USE` variable if it is set
+when a target is created.
diff --git a/Help/variable/CMAKE_LINK_WHAT_YOU_USE.rst
b/Help/variable/CMAKE_LINK_WHAT_YOU_USE.rst
new file mode 100644
index 000..90c4d3f
--- /dev/null
+++ b/Help/variable/CMAKE_LINK_WHAT_YOU_USE.rst
@@ -0,0 +1,6 @@
+CMAKE_LINK_WHAT_YOU_USE
+-
+
+Default value for :prop_tgt:`LINK_WHAT_YOU_USE` target property.
+This variable is used to initialize the property on each target as it is
+created.
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx
b/Source/cmMakefileExecutableTargetGenerator.cxx
index 9d42257..9c34125 100644
--- a/Source/cmMakefileExecutableTargetGene
[Cmake-commits] CMake branch, next, updated. v3.6.1-1663-g908cfab
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 908cfab96a7cb0edbde586e6b31d28f36623577f (commit)
via ca0497c945460a10d2bb273be1f39e35c9c88742 (commit)
from c01d364e2bd3ce04cc251e44aa21022204d69176 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=908cfab96a7cb0edbde586e6b31d28f36623577f
commit 908cfab96a7cb0edbde586e6b31d28f36623577f
Merge: c01d364 ca0497c
Author: Bill Hoffman
AuthorDate: Wed Aug 31 11:24:16 2016 -0400
Commit: CMake Topic Stage
CommitDate: Wed Aug 31 11:24:16 2016 -0400
Merge topic 'extend_matlab_unit_test' into next
ca0497c9 Extend matlab_add_unit_test to run arbitrary code for the test.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca0497c945460a10d2bb273be1f39e35c9c88742
commit ca0497c945460a10d2bb273be1f39e35c9c88742
Author: Bill Hoffman
AuthorDate: Tue Aug 30 15:02:35 2016 -0400
Commit: Bill Hoffman
CommitDate: Wed Aug 31 10:42:13 2016 -0400
Extend matlab_add_unit_test to run arbitrary code for the test.
This commit allows a custom matlab set of commands to be run
as the test instead of runtests('matlab_file_name'). It also
escapes strings for matlab commands to allow for complicated
matlab commands to be passed into the tests.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 9f96fe6..aaca953 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -635,7 +635,7 @@ function(matlab_get_version_from_matlab_run
matlab_binary_program matlab_list_ve
set(devnull INPUT_FILE NUL)
endif()
- # timeout set to 30 seconds, in case it does not start
+ # timeout set to 120 seconds, in case it does not start
# note as said before OUTPUT_VARIABLE cannot be used in a platform
# independent manner however, not setting it would flush the output of Matlab
# in the current console (unix variant)
@@ -644,12 +644,17 @@ function(matlab_get_version_from_matlab_run
matlab_binary_program matlab_list_ve
OUTPUT_VARIABLE _matlab_version_from_cmd_dummy
RESULT_VARIABLE _matlab_result_version_call
ERROR_VARIABLE _matlab_result_version_call_error
-TIMEOUT 30
+TIMEOUT 120
WORKING_DIRECTORY "${_matlab_temporary_folder}"
${devnull}
)
-
-
+ if("${_matlab_result_version_call}" MATCHES "timeout")
+if(MATLAB_FIND_DEBUG)
+ message(WARNING "[MATLAB] Unable to determine the version of Matlab."
+" Matlab call timed out after 120 seconds.")
+endif()
+return()
+ endif()
if(${_matlab_result_version_call})
if(MATLAB_FIND_DEBUG)
message(WARNING "[MATLAB] Unable to determine the version of Matlab.
Matlab call returned with error ${_matlab_result_version_call}.")
@@ -698,7 +703,6 @@ function(matlab_get_version_from_matlab_run
matlab_binary_program matlab_list_ve
endfunction()
-
#.rst:
# .. command:: matlab_add_unit_test
#
@@ -720,6 +724,7 @@ endfunction()
# matlab_add_unit_test(
# NAME
# UNITTEST_FILE matlab_file_containing_unittest.m
+# [CUSTOM_MATLAB_COMMAND matlab_command_to_run_as_test]
# [UNITTEST_PRECOMMAND matlab_command_to_run]
# [TIMEOUT timeout]
# [ADDITIONAL_PATH path1 [path2 ...]]
@@ -735,6 +740,11 @@ endfunction()
# ``UNITTEST_FILE``
# the matlab unittest file. Its path will be automatically
# added to the Matlab path.
+# ``CUSTOM_MATLAB_COMMAND``
+# Matlab script command to run as the test.
+# IIf this is not set, then the following is run:
+# "runtests('matlab_file_name'), exit(max([ans(1,:).Failed]))
+# matlab_file_name comes from UNITTEST_FILE without the .m.
# ``UNITTEST_PRECOMMAND``
# Matlab script command to be ran before the file
# containing the test (eg. GPU device initialisation based on CMake
@@ -748,6 +758,7 @@ endfunction()
# ``MATLAB_ADDITIONAL_STARTUP_OPTIONS``
# a list of additional option in order
# to run Matlab from the command line.
+# -nosplash -nodesktop -nodisplay are always added.
# ``TEST_ARGS``
# Additional options provided to the add_test command. These
# options are added to the default options (eg. "CONFIGURATIONS Release")
@@ -762,8 +773,9 @@ function(matlab_add_unit_test)
endif()
set(options NO_UNITTEST_FRAMEWORK)
- set(oneValueArgs NAME UNITTEST_PRECOMMAND UNITTEST_FILE TIMEOUT)
- set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS
TEST_ARGS)
+ set(oneValueArgs NAME UNITTEST_FILE TIMEOUT
[Cmake-commits] CMake branch, next, updated. v3.6.1-1700-ge623fc9
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 e623fc98ca6bfeb4f4fda75b21542aefbcefd78b (commit)
via 48b32fae344ca8bab5f0b93b0570e4d8b7ef1eca (commit)
from 1ec2259fe60a0d147bd85ce171120a5bdafa6fbe (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e623fc98ca6bfeb4f4fda75b21542aefbcefd78b
commit e623fc98ca6bfeb4f4fda75b21542aefbcefd78b
Merge: 1ec2259 48b32fa
Author: Bill Hoffman
AuthorDate: Thu Sep 1 16:34:37 2016 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 1 16:34:37 2016 -0400
Merge topic 'extend_matlab_unit_test' into next
48b32fae remove extra }}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48b32fae344ca8bab5f0b93b0570e4d8b7ef1eca
commit 48b32fae344ca8bab5f0b93b0570e4d8b7ef1eca
Author: Bill Hoffman
AuthorDate: Thu Sep 1 16:33:22 2016 -0400
Commit: Bill Hoffman
CommitDate: Thu Sep 1 16:33:22 2016 -0400
remove extra }}
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 4c787d7..a2289d5 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -795,7 +795,7 @@ function(matlab_add_unit_test)
"-Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}"
"-DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}"
"-Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}"
-"-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}}"
+"-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}"
"-Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}"
-P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
${${prefix}_TEST_ARGS}
---
Summary of changes:
Modules/FindMatlab.cmake |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.6.2-1922-gf8fc47d
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 f8fc47db59a6cbd16a4fdd3238e82f8a5561631f (commit)
via e42471b9d4e4e99f38200a87121f46a7991510cd (commit)
via 9e8dc649129b8ec711d6fb854d4f9576c0dd4dc9 (commit)
via 7d2e9dd88c154707c7434c27edb34de948a51d60 (commit)
from e0aa392d59fed43a0de907fc31518adc8ca1d74e (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8fc47db59a6cbd16a4fdd3238e82f8a5561631f
commit f8fc47db59a6cbd16a4fdd3238e82f8a5561631f
Merge: e0aa392 e42471b
Author: Bill Hoffman
AuthorDate: Fri Sep 9 16:53:44 2016 -0400
Commit: CMake Topic Stage
CommitDate: Fri Sep 9 16:53:44 2016 -0400
Merge topic 'extend_matlab_unit_test' into next
e42471b9 remove stray }
9e8dc649 use single value args
7d2e9dd8 Extend matlab_add_unit_test to run arbitrary code for the test.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e42471b9d4e4e99f38200a87121f46a7991510cd
commit e42471b9d4e4e99f38200a87121f46a7991510cd
Author: Bill Hoffman
AuthorDate: Fri Sep 9 16:33:36 2016 -0400
Commit: Bill Hoffman
CommitDate: Fri Sep 9 16:33:36 2016 -0400
remove stray }
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index fd222fd..0462bd0 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -788,7 +788,7 @@ function(matlab_add_unit_test)
add_test(NAME ${${prefix}_NAME}
COMMAND ${CMAKE_COMMAND}
"-Dtest_name=${${prefix}_NAME}"
-"-Dadditional_paths=${${prefix}_ADDITIONAL_PATH}}"
+"-Dadditional_paths=${${prefix}_ADDITIONAL_PATH}"
"-Dtest_timeout=${${prefix}_TIMEOUT}"
"-Doutput_directory=${_matlab_temporary_folder}"
"-Dworking_directory=${${prefix}_WORKING_DIRECTORY}"
@@ -796,7 +796,7 @@ function(matlab_add_unit_test)
"-Dno_unittest_framework=${${prefix}_NO_UNITTEST_FRAMEWORK}"
"-DMatlab_ADDITIONNAL_STARTUP_OPTIONS=${${prefix}_MATLAB_ADDITIONAL_STARTUP_OPTIONS}"
"-Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}"
-"-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}}"
+"-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}"
"-Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}"
-P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
${${prefix}_TEST_ARGS}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e8dc649129b8ec711d6fb854d4f9576c0dd4dc9
commit 9e8dc649129b8ec711d6fb854d4f9576c0dd4dc9
Author: Bill Hoffman
AuthorDate: Fri Sep 9 14:44:48 2016 -0400
Commit: Bill Hoffman
CommitDate: Fri Sep 9 14:44:48 2016 -0400
use single value args
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 7c03635..fd222fd 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -773,9 +773,10 @@ function(matlab_add_unit_test)
endif()
set(options NO_UNITTEST_FRAMEWORK)
- set(oneValueArgs NAME UNITTEST_FILE TIMEOUT WORKING_DIRECTORY)
- set(multiValueArgs UNITTEST_PRECOMMAND ADDITIONAL_PATH
-MATLAB_ADDITIONAL_STARTUP_OPTIONS TEST_ARGS CUSTOM_TEST_COMMAND)
+ set(oneValueArgs NAME UNITTEST_FILE TIMEOUT WORKING_DIRECTORY
+UNITTEST_PRECOMMAND CUSTOM_TEST_COMMAND)
+ set(multiValueArgs ADDITIONAL_PATH MATLAB_ADDITIONAL_STARTUP_OPTIONS
+TEST_ARGS)
set(prefix _matlab_unittest_prefix)
cmake_parse_arguments(PARSE_ARGV 0 ${prefix} "${options}" "${oneValueArgs}"
"${multiValueArgs}" )
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d2e9dd88c154707c7434c27edb34de948a51d60
commit 7d2e9dd88c154707c7434c27edb34de948a51d60
Author: Bill Hoffman
AuthorDate: Tue Aug 30 15:02:35 2016 -0400
Commit: Bill Hoffman
CommitDate: Fri Sep 9 14:41:53 2016 -0400
Extend matlab_add_unit_test to run arbitrary code for the test.
This commit allows a custom matlab set of commands to be run
as the test instead of runtests('matlab_file_name'). It also
escapes strings for matlab commands to allow for complicated
matlab commands to be passed into the tests.
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index b501599..7c03635 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -635,7 +635,7 @@ function(matlab_get_version_from_matlab_run
matlab_binary_program matlab_list_ve
set(devnull INPUT_FILE NUL)
endif()
- # t
[Cmake-commits] CMake branch, next, updated. v2.8.1-1318-gf24a357
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 f24a357c54e940dbfc0670d1b66f75f146910206 (commit) via d06a547a78ff2e8b4b3380a39bead5408aabdac6 (commit) via dc6ed8ee8c75fb8aaf5d88f868f8ddf17dc2baa5 (commit) from 417d98fba6bc5741826ba99342edfd1c7940447a (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=f24a357c54e940dbfc0670d1b66f75f146910206 commit f24a357c54e940dbfc0670d1b66f75f146910206 Merge: 417d98f d06a547 Author: Bill Hoffman Date: Sat Jun 5 13:05:38 2010 -0400 Merge branch 'verbose_failed_tests_releases' into next http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d06a547a78ff2e8b4b3380a39bead5408aabdac6 commit d06a547a78ff2e8b4b3380a39bead5408aabdac6 Author: Bill Hoffman Date: Sat Jun 5 13:03:14 2010 -0400 When running tests for releases use verbose output for failed tests. diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in index b2ca348..4189728 100755 --- a/Utilities/Release/release_cmake.sh.in +++ b/Utilities/Release/release_cmake.sh.in @@ -123,7 +123,7 @@ check_exit_value $? "Build cmake" || exit 1 if [ -z "@SKIP_TESTS@" ]; then echo "Run cmake tests" -./bin/ctest -j @PROCESSORS@ test +./bin/ctest --output-on-failure -j @PROCESSORS@ test check_exit_value $? "Test cmake" || exit 1 fi --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- Utilities/Release/release_cmake.sh.in |2 +- 2 files changed, 2 insertions(+), 2 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.1-1383-g1ef2dc0
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 1ef2dc01af9212c955ae3b15d642073598091573 (commit)
via c74556bdfc9cf657619583a9e070aaea65a0b525 (commit)
via b9e3c243d476efa04479d253cfc4f76ecbdb6fe3 (commit)
from 5524d73287289456a37aa4fdb6e97bb9a041d9c3 (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=1ef2dc01af9212c955ae3b15d642073598091573
commit 1ef2dc01af9212c955ae3b15d642073598091573
Merge: 5524d73 c74556b
Author: Bill Hoffman
Date: Fri Jun 11 13:49:16 2010 -0400
Merge branch 'make_libarchive_use_cmzlib' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c74556bdfc9cf657619583a9e070aaea65a0b525
commit c74556bdfc9cf657619583a9e070aaea65a0b525
Author: Bill Hoffman
Date: Fri Jun 11 13:48:23 2010 -0400
Make sure libarchive uses cmzlib and not the system libz if found.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69b45a4..ff31dd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,6 +271,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
SET(HAVE_ZLIB_H 1)
SET(ZLIB_INCLUDE_DIR ${CMAKE_ZLIB_INCLUDES})
SET(ZLIB_LIBRARIES ${CMAKE_ZLIB_LIBRARIES})
+SET(ZLIB_LIBRARY ${CMAKE_ZLIB_LIBRARIES})
SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE)
ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
ADD_SUBDIRECTORY(Utilities/cmlibarchive)
---
Summary of changes:
CMakeLists.txt |1 +
Source/kwsys/ProcessUNIX.c |8
Source/kwsys/ProcessWin32.c |8
3 files changed, 17 insertions(+), 0 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.1-1458-g57aa177
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 57aa17786387a71d39a6139a0efee3e7ec1a13ea (commit)
via 8f8c1edca2f577e2fc0507186c033cdfd2b28d4f (commit)
from dcfff5821e390660aa8f5828483af7eca5117a52 (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=57aa17786387a71d39a6139a0efee3e7ec1a13ea
commit 57aa17786387a71d39a6139a0efee3e7ec1a13ea
Merge: dcfff58 8f8c1ed
Author: Bill Hoffman
Date: Tue Jun 22 09:57:23 2010 -0400
Merge branch 'fix_ctest_failure_code' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f8c1edca2f577e2fc0507186c033cdfd2b28d4f
commit 8f8c1edca2f577e2fc0507186c033cdfd2b28d4f
Author: Bill Hoffman
Date: Tue Jun 22 09:55:09 2010 -0400
Fix for bug #10859, ctest exit exception incorrectly reported.
CTest was using the return value from the program instead of the
exit exception value for the process.
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 4c9675b..bd644c6 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -220,7 +220,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t
total, bool started)
{
outputTestErrorsToConsole = this->CTest->OutputTestOutputOnTestFailure;
cmCTestLog(this->CTest, HANDLER_OUTPUT, "***Exception: ");
-switch ( retVal )
+switch(this->TestProcess->GetExitException())
{
case cmsysProcess_Exception_Fault:
cmCTestLog(this->CTest, HANDLER_OUTPUT, "SegFault");
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx
index 9aa40d6..0ee631f 100644
--- a/Source/CTest/cmProcess.cxx
+++ b/Source/CTest/cmProcess.cxx
@@ -264,3 +264,9 @@ int cmProcess::ReportStatus()
return result;
}
+
+
+int cmProcess::GetExitException()
+{
+ return cmsysProcess_GetExitException(this->Process);
+}
diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h
index 01dacf9..ff99ca2 100644
--- a/Source/CTest/cmProcess.h
+++ b/Source/CTest/cmProcess.h
@@ -43,7 +43,7 @@ public:
void SetId(int id) { this->Id = id;}
int GetExitValue() { return this->ExitValue;}
double GetTotalTime() { return this->TotalTime;}
-
+ int GetExitException();
/**
* Read one line of output but block for no more than timeout.
* Returns:
---
Summary of changes:
Source/CTest/cmCTestRunTest.cxx |2 +-
Source/CTest/cmProcess.cxx |6 ++
Source/CTest/cmProcess.h|2 +-
3 files changed, 8 insertions(+), 2 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.1-1508-ge548a88
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 e548a88579a021598bcf0fc703246d265e7cc605 (commit)
via 696a0af22022c6d629d67fcff2c7e779c917e187 (commit)
from 358773feafe7acb4305038ed53d79c854348bc2d (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=e548a88579a021598bcf0fc703246d265e7cc605
commit e548a88579a021598bcf0fc703246d265e7cc605
Merge: 358773f 696a0af
Author: Bill Hoffman
Date: Fri Jun 25 12:57:34 2010 -0400
Merge branch 'disable_gcc33_onfree_bsd' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=696a0af22022c6d629d67fcff2c7e779c917e187
commit 696a0af22022c6d629d67fcff2c7e779c917e187
Author: Bill Hoffman
Date: Fri Jun 25 12:54:16 2010 -0400
Disable gcc 33 on OpenBSD because it crashes CPack by default.
Make sure no one tries to use gcc 33 based tools to build CMake.
This is because a cpack test failed with a crash. The crash
seems to be caused by the stack checking code on by default in
OpenBSD. The crash is in some stl code. The problem is fixed
with newer gcc compilers on OpenBSD.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd90163..8b41cc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,21 @@ ENDIF(COMMAND CMAKE_POLICY)
MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
+IF(CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
+ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER}
+${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+OUTPUT_VARIABLE _GXX_VERSION
+ )
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+_GXX_VERSION_SHORT ${_GXX_VERSION})
+ IF(_GXX_VERSION_SHORT EQUAL 33)
+MESSAGE(FATAL_ERROR
+ "GXX 3.3 on OpenBSD is known to cause CPack to Crash.\n"
+ "Please use GXX 4.2 or greater to build CMake on OpenBSD\n"
+ "${CMAKE_CXX_COMPILER} version is: ${_GXX_VERSION}")
+ ENDIF()
+ENDIF()
+
# Allow empty endif() and such with CMake 2.4.
SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
---
Summary of changes:
CMakeLists.txt | 15 +++
1 files changed, 15 insertions(+), 0 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.2-233-g3cde195
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 3cde1954a41ee92f2d26c8e808e05c77f3df35cb (commit)
via 8507a73ea6e394b6ad42b7a2df562ee7b4bd4950 (commit)
via 6327429f55949702f0d0c8e2888a9ae01910382b (commit)
from 4e7b24ea9f5ac63d04a65e184d33e09d36596e75 (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=3cde1954a41ee92f2d26c8e808e05c77f3df35cb
commit 3cde1954a41ee92f2d26c8e808e05c77f3df35cb
Merge: 4e7b24e 8507a73
Author: Bill Hoffman
AuthorDate: Tue Jul 13 09:09:08 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Jul 13 09:09:08 2010 -0400
Merge branch 'guid_vs_newname' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8507a73ea6e394b6ad42b7a2df562ee7b4bd4950
commit 8507a73ea6e394b6ad42b7a2df562ee7b4bd4950
Author: Bill Hoffman
AuthorDate: Tue Jul 13 09:07:59 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Jul 13 09:07:59 2010 -0400
Fix for bug#10483, INCLUDE_EXTERNAL_MSPROJECT: ProjectGUID now ProjectGuid
diff --git a/Source/cmLocalVisualStudio10Generator.cxx
b/Source/cmLocalVisualStudio10Generator.cxx
index 8df0ffa..57d8653 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -37,7 +37,7 @@ class cmVS10XMLParser : public cmXMLParser
{
return;
}
- if(strcmp("ProjectGUID", name) == 0)
+ if(strcmp("ProjectGUID", name) == 0 || strcmp("ProjectGuid", name) == 0)
{
this->DoGUID = true;
}
---
Summary of changes:
Source/cmLocalVisualStudio10Generator.cxx |2 +-
Source/kwsys/kwsysDateStamp.cmake |2 +-
2 files changed, 2 insertions(+), 2 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.2-328-g4de4af4
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 4de4af4bc910addcbdd97ef373b5a04bb5824d05 (commit)
via 466cef5a75cc8ea22719285d44cf8ef53db0be22 (commit)
via 8342eacda7dd78c8776de63d7fe300d751f26f61 (commit)
from 423218b14cca3d8d85757443d53c7b2eceebbe64 (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=4de4af4bc910addcbdd97ef373b5a04bb5824d05
commit 4de4af4bc910addcbdd97ef373b5a04bb5824d05
Merge: 423218b 466cef5
Author: Bill Hoffman
AuthorDate: Tue Aug 3 09:38:31 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Aug 3 09:38:31 2010 -0400
Merge branch 'external_project_gmake_cygwin' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=466cef5a75cc8ea22719285d44cf8ef53db0be22
commit 466cef5a75cc8ea22719285d44cf8ef53db0be22
Author: Bill Hoffman
AuthorDate: Tue Aug 3 09:37:31 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Aug 3 09:37:31 2010 -0400
Fix external project using cygwin gmake with VS compilers.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index b4359c8..e15d537 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -621,11 +621,29 @@ function(_ep_write_log_script name step cmd_var)
set(command "${${cmd_var}}")
set(make "")
+ set(code_cygpath_make "")
if("${command}" MATCHES "^\\$\\(MAKE\\)")
# GNU make recognizes the string "$(MAKE)" as recursive make, so
# ensure that it appears directly in the makefile.
string(REGEX REPLACE "^\\$\\(MAKE\\)" "\${make}" command "${command}")
set(make "-Dmake=$(MAKE)")
+
+if(WIN32 AND NOT CYGWIN)
+ set(code_cygpath_make "
+if(\${make} MATCHES \"^/\")
+ execute_process(
+COMMAND cygpath -w \${make}
+OUTPUT_VARIABLE cygpath_make
+ERROR_VARIABLE cygpath_make
+RESULT_VARIABLE cygpath_error
+OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ if(NOT cygpath_error)
+set(make \${cygpath_make})
+ endif()
+endif()
+")
+endif()
endif()
set(config "")
@@ -638,6 +656,7 @@ function(_ep_write_log_script name step cmd_var)
# script so all output can be sent to one log file.
if("${command}" MATCHES ";COMMAND;")
set(code_execute_process "
+${code_cygpath_make}
execute_process(COMMAND \${command} RESULT_VARIABLE result)
if(result)
set(msg \"Command failed (\${result}):\\n\")
@@ -669,6 +688,7 @@ endif()
set(script ${stamp_dir}/${name}-${step}.cmake)
set(logbase ${stamp_dir}/${name}-${step})
file(WRITE ${script} "
+${code_cygpath_make}
set(command \"${command}\")
execute_process(
COMMAND \${command}
---
Summary of changes:
Modules/ExternalProject.cmake | 20
Source/kwsys/kwsysDateStamp.cmake |2 +-
2 files changed, 21 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
[Cmake-commits] CMake branch, next, updated. v2.8.2-385-g8bd3fb7
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 8bd3fb71b0a6343bc14db4368c35ec7097bc1541 (commit)
via 929b1c6be335dbb480de0814b02ccd56836282c3 (commit)
from c4663ab035bc4340cabdce3ee047d8c48fccbc90 (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=8bd3fb71b0a6343bc14db4368c35ec7097bc1541
commit 8bd3fb71b0a6343bc14db4368c35ec7097bc1541
Merge: c4663ab 929b1c6
Author: Bill Hoffman
AuthorDate: Mon Aug 9 13:23:11 2010 -0400
Commit: Bill Hoffman
CommitDate: Mon Aug 9 13:23:11 2010 -0400
Merge branch 'remove_submit_large_output' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=929b1c6be335dbb480de0814b02ccd56836282c3
commit 929b1c6be335dbb480de0814b02ccd56836282c3
Author: Bill Hoffman
AuthorDate: Mon Aug 9 13:21:19 2010 -0400
Commit: Bill Hoffman
CommitDate: Mon Aug 9 13:21:19 2010 -0400
Remove the ctest submit larget output test.
This test is better covered in CDash now. It is always failing due
to changes in CDash. So, it is better removed from CMake.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 0743c5a..5383bda 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1520,36 +1520,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
ENDIF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS AND
CMAKE_TESTS_CDASH_SERVER)
- IF(NOT DEFINED CTEST_RUN_CTestSubmitLargeOutput)
-SET(CTEST_RUN_CTestSubmitLargeOutput OFF)
-
-IF (CMAKE_TESTS_CDASH_SERVER AND "${server}" STREQUAL "localhost")
- SET(CTEST_RUN_CTestSubmitLargeOutput ON)
-ENDIF (CMAKE_TESTS_CDASH_SERVER AND "${server}" STREQUAL "localhost")
- ENDIF(NOT DEFINED CTEST_RUN_CTestSubmitLargeOutput)
-
- IF(CTEST_RUN_CTestSubmitLargeOutput)
-CONFIGURE_FILE(
- "${CMake_SOURCE_DIR}/Tests/CTestSubmitLargeOutput/test.cmake.in"
- "${CMake_BINARY_DIR}/Tests/CTestSubmitLargeOutput/test.cmake"
- @ONLY ESCAPE_QUOTES
- )
-ADD_TEST(CTestSubmitLargeOutput ${CMAKE_CTEST_COMMAND}
- -S "${CMake_BINARY_DIR}/Tests/CTestSubmitLargeOutput/test.cmake" -V
- --output-log
"${CMake_BINARY_DIR}/Tests/CTestSubmitLargeOutput/testOutput.log"
- )
-
-# This test only passes if it fails to submit properly...
-#
-SET_TESTS_PROPERTIES(CTestSubmitLargeOutput PROPERTIES
- PASS_REGULAR_EXPRESSION "Errors occurred during submission")
-
-# Give this test plenty of time to run on slower machines:
-#
-SET_TESTS_PROPERTIES(CTestSubmitLargeOutput PROPERTIES
- TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
- ENDIF(CTEST_RUN_CTestSubmitLargeOutput)
-
IF (CMAKE_RUN_LONG_TESTS AND TEST_KDE4_STABLE_BRANCH)
IF(UNIX)
IF(NOT QT4_FOUND)
diff --git a/Tests/CTestSubmitLargeOutput/CMakeLists.txt
b/Tests/CTestSubmitLargeOutput/CMakeLists.txt
deleted file mode 100644
index 6c30e7a..000
--- a/Tests/CTestSubmitLargeOutput/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-project(SubmitLargeOutput NONE)
-
-include(CTest)
-
-add_test(GenerateRandomOutput ${CMAKE_COMMAND}
- -P ${CMAKE_CURRENT_SOURCE_DIR}/GenerateRandomOutput.cmake
- )
diff --git a/Tests/CTestSubmitLargeOutput/CTestConfig.cmake
b/Tests/CTestSubmitLargeOutput/CTestConfig.cmake
deleted file mode 100644
index ffd6efc..000
--- a/Tests/CTestSubmitLargeOutput/CTestConfig.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(CTEST_PROJECT_NAME "SubmitLargeOutput")
-set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "www.cdash.org")
-set(CTEST_DROP_LOCATION "/CDash/submit.php?project=PublicDashboard")
-set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/Tests/CTestSubmitLargeOutput/GenerateRandomOutput.cmake
b/Tests/CTestSubmitLargeOutput/GenerateRandomOutput.cmake
deleted file mode 100644
index c7f4f29..000
--- a/Tests/CTestSubmitLargeOutput/GenerateRandomOutput.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# This script generates random lines of output.
-#
-# By default, it generates 100M of output (a million lines of 100 bytes each),
-# but you can override that by passing in -D line_count and/or -D line_size...
-#
-
-# Default values:
-#
-if(NOT DEFINED line_count)
- set(line_count 100)
-endif()
-
-if(NOT DEFINED line_size)
- set(line_size 100)
-endif()
-
-if(NOT DEFINED random_seed)
- set(random_seed 1987)
-endif()
-
-# Use RANDOM_SEED
[Cmake-commits] CMake branch, next, updated. v2.8.2-660-g1150c63
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 1150c63c517658d3e702f8098b355fa165807ec8 (commit)
via ced61f5722d65525fd4b8dbf96d5ea8f254099c2 (commit)
via f9436016401416b21f6dfc30b5a548c909f649bb (commit)
from 8aa478a07207baae969e2a49729e72e5eb50e67c (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=1150c63c517658d3e702f8098b355fa165807ec8
commit 1150c63c517658d3e702f8098b355fa165807ec8
Merge: 8aa478a ced61f5
Author: Bill Hoffman
AuthorDate: Thu Sep 2 12:07:45 2010 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 2 12:07:45 2010 -0400
Merge topic 'allow_upper_case_cpp_and_others' into next
ced61f5 Let CMake recognize .CPP .CXX and .C++ as c++ files.
f943601 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ced61f5722d65525fd4b8dbf96d5ea8f254099c2
commit ced61f5722d65525fd4b8dbf96d5ea8f254099c2
Author: Bill Hoffman
AuthorDate: Thu Sep 2 11:56:40 2010 -0400
Commit: Bill Hoffman
CommitDate: Thu Sep 2 11:56:40 2010 -0400
Let CMake recognize .CPP .CXX and .C++ as c++ files.
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index b264da1..e1b25d2 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -21,8 +21,8 @@ IF(CMAKE_COMPILER_IS_MINGW)
SET(MINGW 1)
ENDIF(CMAKE_COMPILER_IS_MINGW)
SET(CMAKE_CXX_COMPILER_ID_RUN 1)
-SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm)
+SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)
+SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;C++;CC;CPP;CXX)
SET(CMAKE_CXX_LINKER_PREFERENCE 30)
SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index bfc8271..8418ad9 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,7 @@
project (CxxOnly CXX)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-add_library(testcxx1 STATIC libcxx1.cxx)
+add_library(testcxx1 STATIC libcxx1.cxx test.CPP test.CXX test.C++)
add_library(testcxx2 SHARED libcxx2.cxx)
add_executable (CxxOnly cxxonly.cxx)
target_link_libraries(CxxOnly testcxx1 testcxx2)
diff --git a/Tests/CxxOnly/cxxonly.cxx b/Tests/CxxOnly/cxxonly.cxx
index 99ccf3b..2996e65 100644
--- a/Tests/CxxOnly/cxxonly.cxx
+++ b/Tests/CxxOnly/cxxonly.cxx
@@ -1,10 +1,14 @@
#include "libcxx1.h"
#include "libcxx2.h"
+extern int testCPP;
+extern int testCXX;
+extern int testCplusplus;
#include
int main ()
{
+ testCPP = testCXX= testCplusplus = 1;
if ( LibCxx1Class::Method() != 2.0 )
{
printf("Problem with libcxx1\n");
diff --git a/Tests/CxxOnly/test.C++ b/Tests/CxxOnly/test.C++
new file mode 100644
index 000..6049ef1
--- /dev/null
+++ b/Tests/CxxOnly/test.C++
@@ -0,0 +1 @@
+int testCplusplus;
diff --git a/Tests/CxxOnly/test.CPP b/Tests/CxxOnly/test.CPP
new file mode 100644
index 000..8a3cde2
--- /dev/null
+++ b/Tests/CxxOnly/test.CPP
@@ -0,0 +1 @@
+int testCPP;
diff --git a/Tests/CxxOnly/test.CXX b/Tests/CxxOnly/test.CXX
new file mode 100644
index 000..c05f788
--- /dev/null
+++ b/Tests/CxxOnly/test.CXX
@@ -0,0 +1 @@
+int testCXX;
---
Summary of changes:
Modules/CMakeCXXCompiler.cmake.in |4 ++--
Source/kwsys/kwsysDateStamp.cmake |2 +-
Tests/CxxOnly/CMakeLists.txt |2 +-
Tests/CxxOnly/cxxonly.cxx |4
Tests/CxxOnly/test.C++|1 +
Tests/CxxOnly/test.CPP|1 +
Tests/CxxOnly/test.CXX|1 +
7 files changed, 11 insertions(+), 4 deletions(-)
create mode 100644 Tests/CxxOnly/test.C++
create mode 100644 Tests/CxxOnly/test.CPP
create mode 100644 Tests/CxxOnly/test.CXX
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.2-662-g1e822b9
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 1e822b994fb64540bcb5bcc0dd3429d404ba9307 (commit)
via 3b7da5396d1c5085e4c55687877c89034e89c65e (commit)
from 1150c63c517658d3e702f8098b355fa165807ec8 (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=1e822b994fb64540bcb5bcc0dd3429d404ba9307
commit 1e822b994fb64540bcb5bcc0dd3429d404ba9307
Merge: 1150c63 3b7da53
Author: Bill Hoffman
AuthorDate: Thu Sep 2 14:39:35 2010 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 2 14:39:35 2010 -0400
Merge topic 'watcom_fixes' into next
3b7da53 Fix for bug 10388, fix various default flags.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b7da5396d1c5085e4c55687877c89034e89c65e
commit 3b7da5396d1c5085e4c55687877c89034e89c65e
Author: Bill Hoffman
AuthorDate: Thu Sep 2 14:35:17 2010 -0400
Commit: Bill Hoffman
CommitDate: Thu Sep 2 14:35:17 2010 -0400
Fix for bug 10388, fix various default flags.
diff --git a/Modules/Platform/Windows-wcl386.cmake
b/Modules/Platform/Windows-wcl386.cmake
index 7fc345f..e96ebb5 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -12,17 +12,29 @@ ELSE(CMAKE_VERBOSE_MAKEFILE)
SET(CMAKE_LIB_QUIET "-q")
ENDIF(CMAKE_VERBOSE_MAKEFILE)
+set(CMAKE_CREATE_WIN32_EXE "system nt_win" )
+SET(CMAKE_CREATE_CONSOLE_EXE "system nt" )
+
+SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "debug all" )
+SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT "debug all" )
+SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "debug all" )
+SET (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT "debug all" )
+
+set (CMAKE_SHARED_LIBRARY_C_FLAGS "-bd" )
+
+SET(CMAKE_RC_COMPILER "rc" )
+
SET(CMAKE_BUILD_TYPE_INIT Debug)
SET (CMAKE_CXX_FLAGS_INIT "-w=3 -xs")
-SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-br -bm -d2")
+SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-br -bm -d2")
SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-br -bm -os -dNDEBUG")
SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-br -bm -ot -dNDEBUG")
SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-br -bm -d2 -ot -dNDEBUG")
SET (CMAKE_C_FLAGS_INIT "-w=3 ")
-SET (CMAKE_C_FLAGS_DEBUG_INIT "-br -bm -od")
+SET (CMAKE_C_FLAGS_DEBUG_INIT "-br -bm -d2 -od")
SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-br -bm -os -dNDEBUG")
SET (CMAKE_C_FLAGS_RELEASE_INIT "-br -bm -ot -dNDEBUG")
-SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-br -bm -ot -dNDEBUG")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-br -bm -d2 -ot -dNDEBUG")
SET (CMAKE_C_STANDARD_LIBRARIES_INIT "library clbrdll.lib library plbrdll.lib
library kernel32.lib library user32.lib library gdi32.lib library winspool.lib
library comdlg32.lib library advapi32.lib library shell32.lib library ole32.lib
library oleaut32.lib library uuid.lib library odbc32.lib library odbccp32.lib")
SET (CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
@@ -33,6 +45,7 @@ SET(CMAKE_CXX_CREATE_IMPORT_LIBRARY
${CMAKE_C_CREATE_IMPORT_LIBRARY})
SET(CMAKE_C_LINK_EXECUTABLE
"wlink ${CMAKE_START_TEMP_FILE} ${CMAKE_WLINK_QUIET} name
'' option caseexact file {}
${CMAKE_END_TEMP_FILE}")
+
SET(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_C_LINK_EXECUTABLE})
# compile a C++ file into an object file
---
Summary of changes:
Modules/Platform/Windows-wcl386.cmake | 19 ---
1 files changed, 16 insertions(+), 3 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.2-664-g91309fc
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 91309fcaee1e481732f2ba216d371a70b8e27afc (commit)
via d26cd46989b4e1170cbebc97ae3b6b30395158db (commit)
from 1e822b994fb64540bcb5bcc0dd3429d404ba9307 (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=91309fcaee1e481732f2ba216d371a70b8e27afc
commit 91309fcaee1e481732f2ba216d371a70b8e27afc
Merge: 1e822b9 d26cd46
Author: Bill Hoffman
AuthorDate: Thu Sep 2 18:07:42 2010 -0400
Commit: CMake Topic Stage
CommitDate: Thu Sep 2 18:07:42 2010 -0400
Merge topic 'allow_upper_case_cpp_and_others' into next
d26cd46 Only use .CPP .CXX and .C++ do not work by default with g+++.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d26cd46989b4e1170cbebc97ae3b6b30395158db
commit d26cd46989b4e1170cbebc97ae3b6b30395158db
Author: Bill Hoffman
AuthorDate: Thu Sep 2 18:02:57 2010 -0400
Commit: Bill Hoffman
CommitDate: Thu Sep 2 18:02:57 2010 -0400
Only use .CPP .CXX and .C++ do not work by default with g+++.
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index e1b25d2..d7ae8d9 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -22,7 +22,7 @@ IF(CMAKE_COMPILER_IS_MINGW)
ENDIF(CMAKE_COMPILER_IS_MINGW)
SET(CMAKE_CXX_COMPILER_ID_RUN 1)
SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;C++;CC;CPP;CXX)
+SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;CPP)
SET(CMAKE_CXX_LINKER_PREFERENCE 30)
SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 8418ad9..8258eb4 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,7 @@
project (CxxOnly CXX)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-add_library(testcxx1 STATIC libcxx1.cxx test.CPP test.CXX test.C++)
+add_library(testcxx1 STATIC libcxx1.cxx test.CPP)
add_library(testcxx2 SHARED libcxx2.cxx)
add_executable (CxxOnly cxxonly.cxx)
target_link_libraries(CxxOnly testcxx1 testcxx2)
diff --git a/Tests/CxxOnly/cxxonly.cxx b/Tests/CxxOnly/cxxonly.cxx
index 2996e65..bd4fd59 100644
--- a/Tests/CxxOnly/cxxonly.cxx
+++ b/Tests/CxxOnly/cxxonly.cxx
@@ -1,14 +1,12 @@
#include "libcxx1.h"
#include "libcxx2.h"
extern int testCPP;
-extern int testCXX;
-extern int testCplusplus;
#include
int main ()
{
- testCPP = testCXX= testCplusplus = 1;
+ testCPP = 1;
if ( LibCxx1Class::Method() != 2.0 )
{
printf("Problem with libcxx1\n");
diff --git a/Tests/CxxOnly/test.C++ b/Tests/CxxOnly/test.C++
deleted file mode 100644
index 6049ef1..000
--- a/Tests/CxxOnly/test.C++
+++ /dev/null
@@ -1 +0,0 @@
-int testCplusplus;
diff --git a/Tests/CxxOnly/test.CXX b/Tests/CxxOnly/test.CXX
deleted file mode 100644
index c05f788..000
--- a/Tests/CxxOnly/test.CXX
+++ /dev/null
@@ -1 +0,0 @@
-int testCXX;
---
Summary of changes:
Modules/CMakeCXXCompiler.cmake.in |2 +-
Tests/CxxOnly/CMakeLists.txt |2 +-
Tests/CxxOnly/cxxonly.cxx |4 +---
Tests/CxxOnly/test.C++|1 -
Tests/CxxOnly/test.CXX|1 -
5 files changed, 3 insertions(+), 7 deletions(-)
delete mode 100644 Tests/CxxOnly/test.C++
delete mode 100644 Tests/CxxOnly/test.CXX
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.2-677-gae9934e
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 ae9934e178647216050a770efef9e81814f8ef0b (commit)
via 530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68 (commit)
from ff333f6e03771286133629c6800d317f9e558e31 (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=ae9934e178647216050a770efef9e81814f8ef0b
commit ae9934e178647216050a770efef9e81814f8ef0b
Merge: ff333f6 530ade6
Author: Bill Hoffman
AuthorDate: Mon Sep 6 12:11:24 2010 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 6 12:11:24 2010 -0400
Merge topic 'fix_target_name_with_dot_vs10' into next
530ade6 Fix targets with . in the name for VS 10 IDE.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68
commit 530ade6677ec2c12fe8f3db5f5d71ad0ffaa9e68
Author: Bill Hoffman
AuthorDate: Mon Sep 6 12:06:43 2010 -0400
Commit: Bill Hoffman
CommitDate: Mon Sep 6 12:06:43 2010 -0400
Fix targets with . in the name for VS 10 IDE.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 70680ad..477945b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -838,10 +838,10 @@ void
cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
*this->BuildFileStream << intermediateDir
<< "\n";
this->WritePlatformConfigTag("TargetName", config->c_str(), 3);
-*this->BuildFileStream << cmSystemTools::GetFilenameWithoutExtension(
+*this->BuildFileStream
+ << cmSystemTools::GetFilenameWithoutLastExtension(
targetNameFull.c_str())
<< "\n";
-
this->WritePlatformConfigTag("TargetExt", config->c_str(), 3);
*this->BuildFileStream << cmSystemTools::GetFilenameLastExtension(
targetNameFull.c_str())
@@ -849,7 +849,6 @@ void
cmVisualStudio10TargetGenerator::WritePathAndIncrementalLinkOptions()
this->OutputLinkIncremental(*config);
}
this->WriteString("\n", 2);
-
}
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 8258eb4..0b2c1c5 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,7 @@
project (CxxOnly CXX)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-add_library(testcxx1 STATIC libcxx1.cxx test.CPP)
+add_library(testcxx1.my STATIC libcxx1.cxx test.CPP)
add_library(testcxx2 SHARED libcxx2.cxx)
add_executable (CxxOnly cxxonly.cxx)
-target_link_libraries(CxxOnly testcxx1 testcxx2)
+target_link_libraries(CxxOnly testcxx1.my testcxx2)
---
Summary of changes:
Source/cmVisualStudio10TargetGenerator.cxx |5 ++---
Tests/CxxOnly/CMakeLists.txt |4 ++--
2 files changed, 4 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
[Cmake-commits] CMake branch, next, updated. v2.8.2-679-g1979573
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 1979573855f2b562f8645439cd4a52b4e7ba34c6 (commit)
via ba0a8905395ec7e616bbedee33a83fcf15a86910 (commit)
from ae9934e178647216050a770efef9e81814f8ef0b (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=1979573855f2b562f8645439cd4a52b4e7ba34c6
commit 1979573855f2b562f8645439cd4a52b4e7ba34c6
Merge: ae9934e ba0a890
Author: Bill Hoffman
AuthorDate: Mon Sep 6 12:57:12 2010 -0400
Commit: Bill Hoffman
CommitDate: Mon Sep 6 12:57:12 2010 -0400
Merge branch 'allow_upper_case_cpp_and_others' into next
Conflicts:
Tests/CxxOnly/CMakeLists.txt
diff --cc Tests/CxxOnly/CMakeLists.txt
index 0b2c1c5,4654f44..ad3315c
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@@ -2,7 -2,10 +2,10 @@@
project (CxxOnly CXX)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
- add_library(testcxx1.my STATIC libcxx1.cxx test.CPP)
+ if(MSVC)
+ set(EXTRA_SRCS test.CPP)
+ endif()
-add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS})
++add_library(testcxx1.my STATIC libcxx1.cxx ${EXTRA_SRCS})
add_library(testcxx2 SHARED libcxx2.cxx)
add_executable (CxxOnly cxxonly.cxx)
-target_link_libraries(CxxOnly testcxx1 testcxx2)
+target_link_libraries(CxxOnly testcxx1.my testcxx2)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba0a8905395ec7e616bbedee33a83fcf15a86910
commit ba0a8905395ec7e616bbedee33a83fcf15a86910
Author: Bill Hoffman
AuthorDate: Mon Sep 6 12:43:57 2010 -0400
Commit: Bill Hoffman
CommitDate: Mon Sep 6 12:43:57 2010 -0400
Only test for .CPP on Microsoft compilers which will handle .CPP as c++.
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 8258eb4..4654f44 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,10 @@
project (CxxOnly CXX)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-add_library(testcxx1 STATIC libcxx1.cxx test.CPP)
+if(MSVC)
+ set(EXTRA_SRCS test.CPP)
+endif()
+add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS})
add_library(testcxx2 SHARED libcxx2.cxx)
add_executable (CxxOnly cxxonly.cxx)
target_link_libraries(CxxOnly testcxx1 testcxx2)
diff --git a/Tests/CxxOnly/cxxonly.cxx b/Tests/CxxOnly/cxxonly.cxx
index bd4fd59..9cf6f2d 100644
--- a/Tests/CxxOnly/cxxonly.cxx
+++ b/Tests/CxxOnly/cxxonly.cxx
@@ -1,12 +1,16 @@
#include "libcxx1.h"
#include "libcxx2.h"
+#ifdef _MSC_VER
extern int testCPP;
+#endif
#include
int main ()
{
+#ifdef _MSC_VER
testCPP = 1;
+#endif
if ( LibCxx1Class::Method() != 2.0 )
{
printf("Problem with libcxx1\n");
---
Summary of changes:
Tests/CxxOnly/CMakeLists.txt |5 -
Tests/CxxOnly/cxxonly.cxx|4
2 files changed, 8 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
[Cmake-commits] CMake branch, next, updated. v2.8.2-688-g2966fcb
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 2966fcb5515bb7e4f46d5544c335f4364a78875f (commit)
via 7944e4e0ac37cb1423da2de7a203557b77372aac (commit)
from 09f1930e2281919501ad71c3cf10a153555445d4 (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=2966fcb5515bb7e4f46d5544c335f4364a78875f
commit 2966fcb5515bb7e4f46d5544c335f4364a78875f
Merge: 09f1930 7944e4e
Author: Bill Hoffman
AuthorDate: Tue Sep 7 09:16:37 2010 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 7 09:16:37 2010 -0400
Merge topic 'allow_upper_case_cpp_and_others' into next
7944e4e Allow testing of .CPP on WIN32 as it is a case insensitive OS and
should work.
diff --cc Tests/CxxOnly/CMakeLists.txt
index ad3315c,d621499..5d27890
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@@ -2,10 -2,10 +2,10 @@@
project (CxxOnly CXX)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
- if(MSVC)
+ if(WIN32)
set(EXTRA_SRCS test.CPP)
endif()
-add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS})
+add_library(testcxx1.my STATIC libcxx1.cxx ${EXTRA_SRCS})
add_library(testcxx2 SHARED libcxx2.cxx)
add_executable (CxxOnly cxxonly.cxx)
-target_link_libraries(CxxOnly testcxx1 testcxx2)
+target_link_libraries(CxxOnly testcxx1.my testcxx2)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7944e4e0ac37cb1423da2de7a203557b77372aac
commit 7944e4e0ac37cb1423da2de7a203557b77372aac
Author: Bill Hoffman
AuthorDate: Tue Sep 7 09:14:57 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Sep 7 09:14:57 2010 -0400
Allow testing of .CPP on WIN32 as it is a case insensitive OS and should
work.
diff --git a/Tests/CxxOnly/CMakeLists.txt b/Tests/CxxOnly/CMakeLists.txt
index 4654f44..d621499 100644
--- a/Tests/CxxOnly/CMakeLists.txt
+++ b/Tests/CxxOnly/CMakeLists.txt
@@ -2,7 +2,7 @@
project (CxxOnly CXX)
set(CMAKE_DEBUG_POSTFIX "_test_debug_postfix")
-if(MSVC)
+if(WIN32)
set(EXTRA_SRCS test.CPP)
endif()
add_library(testcxx1 STATIC libcxx1.cxx ${EXTRA_SRCS})
---
Summary of changes:
Tests/CxxOnly/CMakeLists.txt |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
[Cmake-commits] CMake branch, next, updated. v2.8.2-717-g1066e56
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 1066e56d8f72d9b8e0be6f62cea3bce086323083 (commit)
via bd56626a4ad06d43c896c59c2065a3fd1cd3b73a (commit)
from 7902a76524ccc1a33397db763f9f4523d28b15fe (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=1066e56d8f72d9b8e0be6f62cea3bce086323083
commit 1066e56d8f72d9b8e0be6f62cea3bce086323083
Merge: 7902a76 bd56626
Author: Bill Hoffman
AuthorDate: Wed Sep 8 14:52:48 2010 -0400
Commit: CMake Topic Stage
CommitDate: Wed Sep 8 14:52:48 2010 -0400
Merge topic 'fix_osf_build' into next
bd56626 Fixes for the OSF operating system build.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd56626a4ad06d43c896c59c2065a3fd1cd3b73a
commit bd56626a4ad06d43c896c59c2065a3fd1cd3b73a
Author: Bill Hoffman
AuthorDate: Wed Sep 8 14:50:14 2010 -0400
Commit: Bill Hoffman
CommitDate: Wed Sep 8 14:50:14 2010 -0400
Fixes for the OSF operating system build.
diff --git a/Utilities/cmlibarchive/CMakeLists.txt
b/Utilities/cmlibarchive/CMakeLists.txt
index e95935a..8c10b21 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -512,6 +512,8 @@ CHECK_TYPE_SIZE(int64_t INT64_T)
IF(NOT HAVE_INT64_T)
IF(WIN32)
SET(int64_t "__int64")
+ ELSE(WIN32)
+SET(int64_t "long long")
ENDIF(WIN32)
ENDIF(NOT HAVE_INT64_T)
#
@@ -568,9 +570,7 @@ ENDIF(NOT HAVE_UINT16_T)
#
CHECK_TYPE_SIZE(uint32_tUINT32_T)
IF(NOT HAVE_UINT32_T)
- IF(WIN32)
-SET(uint32_t "unsigned int")
- ENDIF(WIN32)
+ SET(uint32_t "unsigned int")
ENDIF(NOT HAVE_UINT32_T)
CHECK_TYPE_SIZE(int32_tINT32_T)
IF(NOT HAVE_INT32_T)
@@ -581,6 +581,8 @@ CHECK_TYPE_SIZE(uint64_tUINT64_T)
IF(NOT HAVE_UINT64_T)
IF(WIN32)
SET(uint64_t "unsigned __int64")
+ ELSE(WIN32)
+SET(uint64_t "unsigned long long")
ENDIF(WIN32)
ENDIF(NOT HAVE_UINT64_T)
#
diff --git a/Utilities/cmlibarchive/build/cmake/config.h.in
b/Utilities/cmlibarchive/build/cmake/config.h.in
index 9af45a0..34dbce3 100644
--- a/Utilities/cmlibarchive/build/cmake/config.h.in
+++ b/Utilities/cmlibarchive/build/cmake/config.h.in
@@ -1,4 +1,7 @@
/* config.h. Generated from config.h.cmake by cmake configure */
+#if defined(__osf__)
+# define _OSF_SOURCE
+#endif
/* Version number of bsdcpio */
#cmakedefine BSDCPIO_VERSION_STRING "${BSDCPIO_VERSION_STRING}"
diff --git a/Utilities/cmlibarchive/libarchive/archive.h
b/Utilities/cmlibarchive/libarchive/archive.h
index 9d84121..9b918a8 100644
--- a/Utilities/cmlibarchive/libarchive/archive.h
+++ b/Utilities/cmlibarchive/libarchive/archive.h
@@ -37,7 +37,7 @@
*/
#if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
# define __LA_STDINT_H
-#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) &&
!defined(__BORLANDC__)
+#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) &&
!defined(__BORLANDC__) && !defined(__osf__)
# define __LA_STDINT_H
#endif
@@ -68,7 +68,11 @@
# endif
#else
#include /* ssize_t, uid_t, and gid_t */
-#define __LA_INT64_Tint64_t
+#if defined(__osf__)
+# define __LA_INT64_Tlong long
+#else
+# define __LA_INT64_Tint64_t
+#endif
#define __LA_SSIZE_Tssize_t
#define __LA_UID_T uid_t
#define __LA_GID_T gid_t
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h
b/Utilities/cmlibarchive/libarchive/archive_entry.h
index 9c7cd43..e85285f 100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry.h
+++ b/Utilities/cmlibarchive/libarchive/archive_entry.h
@@ -61,7 +61,11 @@
# endif
#else
# include
-#define __LA_INT64_Tint64_t
+#ifdef __osf__
+# define __LA_INT64_Tlong long
+#else
+# define __LA_INT64_Tint64_t
+#endif
#define __LA_UID_T uid_t
#define __LA_GID_T gid_t
#define __LA_DEV_T dev_t
---
Summary of changes:
Utilities/cmlibarchive/CMakeLists.txt |8 +---
Utilities/cmlibarchive/build/cmake/config.h.in|3 +++
Utilities/cmlibarchive/libarchive/archive.h |8 ++--
Utilities/cmlibarchive/libarchive/archive_entry.h |6 +-
4 files changed, 19 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, next, updated. v2.8.2-743-g8ae0a03
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 8ae0a038de4dedb709c1bcbf49829f9b0741245b (commit) via 92c082b1c9269a2fcbb9472b02adb3dd57a283ea (commit) from fd2f09f2a8f7340540abadc722b57c139b65d81f (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=8ae0a038de4dedb709c1bcbf49829f9b0741245b commit 8ae0a038de4dedb709c1bcbf49829f9b0741245b Merge: fd2f09f 92c082b Author: Bill Hoffman AuthorDate: Fri Sep 10 13:38:33 2010 -0400 Commit: CMake Topic Stage CommitDate: Fri Sep 10 13:38:33 2010 -0400 Merge topic 'fix_osf_build' into next 92c082b Add a fix for the inline keyword on the osf os. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92c082b1c9269a2fcbb9472b02adb3dd57a283ea commit 92c082b1c9269a2fcbb9472b02adb3dd57a283ea Author: Bill Hoffman AuthorDate: Fri Sep 10 13:37:02 2010 -0400 Commit: Bill Hoffman CommitDate: Fri Sep 10 13:37:02 2010 -0400 Add a fix for the inline keyword on the osf os. diff --git a/Utilities/cmlibarchive/libarchive/archive_endian.h b/Utilities/cmlibarchive/libarchive/archive_endian.h index 067312d..58abee6 100644 --- a/Utilities/cmlibarchive/libarchive/archive_endian.h +++ b/Utilities/cmlibarchive/libarchive/archive_endian.h @@ -48,7 +48,7 @@ */ #if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__) || defined(__SUNPRO_C) #define inline -#elif defined(_MSC_VER) +#elif defined(_MSC_VER) || defined(__osf__) #define inline __inline #endif --- Summary of changes: Utilities/cmlibarchive/libarchive/archive_endian.h |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
[Cmake-commits] CMake branch, next, updated. v2.8.2-747-g561f2eb
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 561f2eb4beb12587018bca4bff99b8acfc9f561f (commit)
via 187976b1f35ee9cca95d67c87f0868f60201dc2b (commit)
from dbf7899e504f00efbc5fb0e65ebceba48d86845e (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=561f2eb4beb12587018bca4bff99b8acfc9f561f
commit 561f2eb4beb12587018bca4bff99b8acfc9f561f
Merge: dbf7899 187976b
Author: Bill Hoffman
AuthorDate: Fri Sep 10 15:48:56 2010 -0400
Commit: CMake Topic Stage
CommitDate: Fri Sep 10 15:48:56 2010 -0400
Merge topic 'fix_release_tags' into next
187976b Fix release scripts to be able to build releases from tags.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=187976b1f35ee9cca95d67c87f0868f60201dc2b
commit 187976b1f35ee9cca95d67c87f0868f60201dc2b
Author: Bill Hoffman
AuthorDate: Fri Sep 10 15:41:27 2010 -0400
Commit: Bill Hoffman
CommitDate: Fri Sep 10 15:41:27 2010 -0400
Fix release scripts to be able to build releases from tags.
diff --git a/Utilities/Release/dash2win64_cygwin.cmake
b/Utilities/Release/dash2win64_cygwin.cmake
index d866896..64099a9 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/dash2win64_cygwin.cmake
@@ -6,12 +6,13 @@ set(HOST dash2win64)
set(CPACK_BINARY_GENERATORS "CygwinBinary")
set(CPACK_SOURCE_GENERATORS "CygwinSource")
set(MAKE_PROGRAM "make")
-set(CVS_COMMAND /usr/bin/cvs)
set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
CMAKE_Fortran_COMPILER_FULLPATH:FILEPATH=FALSE
")
set(CXX g++)
set(CC gcc)
set(SCRIPT_NAME dash2win64cygwin)
+set(GIT_COMMAND git)
+set(GIT_EXTRA "git config core.autocrlf true")
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/release_cmake.cmake
b/Utilities/Release/release_cmake.cmake
index 6fd1372..9a2ede7 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -34,7 +34,11 @@ if(NOT DEFINED CVS_COMMAND)
set(CVS_COMMAND cvs)
endif(NOT DEFINED CVS_COMMAND)
-set(GIT_BRANCH ${CMAKE_CREATE_VERSION})
+if(${GIT_CREATE_VERSION} MATCHES "^(release|maint)$")
+ set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION})
+else()
+ set(GIT_BRANCH ${CMAKE_CREATE_VERSION})
+endif()
set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -d ${CVSROOT} co -d
${CMAKE_CREATE_VERSION} ${CMAKE_CREATE_VERSION}")
diff --git a/Utilities/Release/release_cmake.sh.in
b/Utilities/Release/release_cmake.sh.in
index 4189728..8455e92 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -89,7 +89,7 @@ if [ ! -z "@GIT_COMMAND@" ]; then
@GIT_EXTRA@
check_exit_value $? "git extra cmake source" || exit 1
# now checkout a copy on the local branch working
- @GIT_COMMAND@ checkout -b working origin/@GIT_BRANCH@
+ @GIT_COMMAND@ checkout -b working @GIT_BRANCH@
check_exit_value $? "git checkout" || exit 1
cd ..
else
---
Summary of changes:
Utilities/Release/dash2win64_cygwin.cmake |3 ++-
Utilities/Release/release_cmake.cmake |6 +-
Utilities/Release/release_cmake.sh.in |2 +-
3 files changed, 8 insertions(+), 3 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.2-763-g8e732c6
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 8e732c6e792863e380cec22ece7bf0ed2101d31a (commit)
via 297be5b524ecc22a9ac2deb069c3703946f3147c (commit)
from f341f65b0de9edeb0594948e26b5fcb6d91ca91a (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=8e732c6e792863e380cec22ece7bf0ed2101d31a
commit 8e732c6e792863e380cec22ece7bf0ed2101d31a
Merge: f341f65 297be5b
Author: Bill Hoffman
AuthorDate: Mon Sep 13 11:31:39 2010 -0400
Commit: CMake Topic Stage
CommitDate: Mon Sep 13 11:31:39 2010 -0400
Merge topic 'fix_release_tags' into next
297be5b add next as an orgin based branch, and not a tag.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=297be5b524ecc22a9ac2deb069c3703946f3147c
commit 297be5b524ecc22a9ac2deb069c3703946f3147c
Author: Bill Hoffman
AuthorDate: Mon Sep 13 11:30:23 2010 -0400
Commit: Bill Hoffman
CommitDate: Mon Sep 13 11:30:23 2010 -0400
add next as an orgin based branch, and not a tag.
diff --git a/Utilities/Release/release_cmake.cmake
b/Utilities/Release/release_cmake.cmake
index 9a2ede7..44c44f7 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -34,7 +34,7 @@ if(NOT DEFINED CVS_COMMAND)
set(CVS_COMMAND cvs)
endif(NOT DEFINED CVS_COMMAND)
-if(${GIT_CREATE_VERSION} MATCHES "^(release|maint)$")
+if(${GIT_CREATE_VERSION} MATCHES "^(release|maint|next)$")
set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION})
else()
set(GIT_BRANCH ${CMAKE_CREATE_VERSION})
---
Summary of changes:
Utilities/Release/release_cmake.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
[Cmake-commits] CMake branch, next, updated. v2.8.2-769-g2a31343
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 2a3134388e36616cf34cbb378e9ebfb6b6634475 (commit)
via 7d148d8036e2b2389f6e0cae55b34956c835e98d (commit)
from 7ddcc305907163545c72677b393fefb8f7a84a84 (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=2a3134388e36616cf34cbb378e9ebfb6b6634475
commit 2a3134388e36616cf34cbb378e9ebfb6b6634475
Merge: 7ddcc30 7d148d8
Author: Bill Hoffman
AuthorDate: Tue Sep 14 09:33:34 2010 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 14 09:33:34 2010 -0400
Merge topic 'fix_release_tags' into next
7d148d8 Fix the name of the variable being tested.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d148d8036e2b2389f6e0cae55b34956c835e98d
commit 7d148d8036e2b2389f6e0cae55b34956c835e98d
Author: Bill Hoffman
AuthorDate: Tue Sep 14 09:30:39 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Sep 14 09:30:39 2010 -0400
Fix the name of the variable being tested.
diff --git a/Utilities/Release/release_cmake.cmake
b/Utilities/Release/release_cmake.cmake
index 44c44f7..3a35ec3 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -34,7 +34,7 @@ if(NOT DEFINED CVS_COMMAND)
set(CVS_COMMAND cvs)
endif(NOT DEFINED CVS_COMMAND)
-if(${GIT_CREATE_VERSION} MATCHES "^(release|maint|next)$")
+if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next)$")
set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION})
else()
set(GIT_BRANCH ${CMAKE_CREATE_VERSION})
---
Summary of changes:
Utilities/Release/release_cmake.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
[Cmake-commits] CMake branch, next, updated. v2.8.2-791-g0492dd9
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 0492dd910fa4adbd6391bf923be75513d925c8c1 (commit)
via 390117435ad0595d9fcc9cf4c93f70f7939b8cf6 (commit)
via de7a090847b4e3113209cf518742cbc1988b3fd8 (commit)
from 490682e43f99140e0a846825c17ed30178db5f43 (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=0492dd910fa4adbd6391bf923be75513d925c8c1
commit 0492dd910fa4adbd6391bf923be75513d925c8c1
Merge: 490682e 3901174
Author: Bill Hoffman
AuthorDate: Wed Sep 15 16:43:38 2010 -0400
Commit: CMake Topic Stage
CommitDate: Wed Sep 15 16:43:38 2010 -0400
Merge topic 'fix_line_length_issues' into next
3901174 Fix KWStyle line length issues.
de7a090 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=390117435ad0595d9fcc9cf4c93f70f7939b8cf6
commit 390117435ad0595d9fcc9cf4c93f70f7939b8cf6
Author: Bill Hoffman
AuthorDate: Wed Sep 15 16:41:41 2010 -0400
Commit: Bill Hoffman
CommitDate: Wed Sep 15 16:41:41 2010 -0400
Fix KWStyle line length issues.
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 79ccdd9..c86434e 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -58,9 +58,11 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive,
// Change to local toplevel
cmSystemTools::ChangeDirectory(localToplevel.c_str());
std::vector::const_iterator fileIt;
- for (fileIt = component->Files.begin(); fileIt != component->Files.end();
++fileIt )
+ for (fileIt = component->Files.begin(); fileIt != component->Files.end();
+ ++fileIt )
{
-cmCPackLogger(cmCPackLog::LOG_DEBUG,"Adding file: " << (*fileIt) <<
std::endl);
+cmCPackLogger(cmCPackLog::LOG_DEBUG,"Adding file: "
+ << (*fileIt) << std::endl);
archive.Add(*fileIt);
if (!archive)
{
@@ -85,7 +87,8 @@ cmGeneratedFileStream gf; \
gf.Open(filename.c_str(), false, true); \
if (!GenerateHeader(&gf)) \
{ \
- cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem to generate Header for
archive < " \
+ cmCPackLogger(cmCPackLog::LOG_ERROR, \
+"Problem to generate Header for archive < " \
<< filename \
<< ">." << std::endl); \
return 0; \
@@ -118,7 +121,9 @@ int cmCPackArchiveGenerator::PackageComponents(bool
ignoreComponentGroup)
<< std::endl);
// Begin the archive for this group
std::string packageFileName= std::string(toplevel);
- packageFileName +=
"/"+std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))+"-"+compGIt->first
+ this->GetOutputExtension();
+ packageFileName += "/"
++std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
++"-"+compGIt->first + this->GetOutputExtension();
// open a block in order to automatically close archive
// at the end of the block
{
@@ -142,13 +147,16 @@ int cmCPackArchiveGenerator::PackageComponents(bool
ignoreComponentGroup)
else
{
std::map::iterator compIt;
-for (compIt=this->Components.begin();compIt!=this->Components.end();
++compIt )
+for (compIt=this->Components.begin();
+ compIt!=this->Components.end(); ++compIt )
{
std::string localToplevel(this->GetOption("CPACK_TEMPORARY_DIRECTORY"));
std::string packageFileName = std::string(toplevel);
localToplevel += "/"+ compIt->first;
- packageFileName +=
"/"+std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))+"-"+compIt->first +
this->GetOutputExtension();
+ packageFileName += "/"
++std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
++"-"+compIt->first + this->GetOutputExtension();
{
DECLARE_AND_OPEN_ARCHIVE(packageFileName,archive);
// Add the files of this component to the archive
@@ -167,8 +175,12 @@ int
cmCPackArchiveGenerator::PackageComponentsAllInOne(bool allComponentInOne)
// reset the package file names
packageFileNames.clear();
packageFileNames.push_back(std::string(toplevel));
- packageFileNames[0] +=
"/"+std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))+"-ALL" +
this->GetOutputE
[Cmake-commits] CMake branch, next, updated. v2.8.2-863-g9ac4286
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 9ac4286f9c011be39fd5d3bb45b248a54cf853dd (commit)
via 775697d5f5e8812dc642d1e21e7bc5405df943cd (commit)
from a36448038aab791189a09f9b0a1bdbf002b896f4 (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=9ac4286f9c011be39fd5d3bb45b248a54cf853dd
commit 9ac4286f9c011be39fd5d3bb45b248a54cf853dd
Merge: a364480 775697d
Author: Bill Hoffman
AuthorDate: Tue Sep 21 10:06:51 2010 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 21 10:06:51 2010 -0400
Merge topic 'fix_windows7_untar' into next
775697d Add a delay after untar on windows to make external project work on
windows 7
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=775697d5f5e8812dc642d1e21e7bc5405df943cd
commit 775697d5f5e8812dc642d1e21e7bc5405df943cd
Author: Bill Hoffman
AuthorDate: Tue Sep 21 10:04:04 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Sep 21 10:04:04 2010 -0400
Add a delay after untar on windows to make external project work on windows
7
OK, on windows 7 after we untar some files,
sometimes we can not rename the directory after
the untar is done. This breaks the external project
untar and rename code. So, by default we will wait
1/10th of a second after the untar. If CMAKE_UNTAR_DELAY
is set in the env, its value will be used instead of 100.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index e6c7bb0..1e3b018 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1574,6 +1574,24 @@ int cmake::ExecuteCMakeCommand(std::vector&
args)
cmSystemTools::Error("Problem extracting tar: ", outFile.c_str());
return 1;
}
+#ifdef WIN32
+// OK, on windows 7 after we untar some files,
+// sometimes we can not rename the directory after
+// the untar is done. This breaks the external project
+// untar and rename code. So, by default we will wait
+// 1/10th of a second after the untar. If CMAKE_UNTAR_DELAY
+// is set in the env, its value will be used instead of 100.
+int delay = 100;
+const char* delayVar = cmSystemTools::GetEnv("CMAKE_UNTAR_DELAY");
+if(delayVar)
+ {
+ delay = atoi(delayVar);
+ }
+if(delay)
+ {
+ cmSystemTools::Delay(delay);
+ }
+#endif
}
return 0;
}
---
Summary of changes:
Source/cmake.cxx | 18 ++
1 files changed, 18 insertions(+), 0 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.2-879-gdc23a9a
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 dc23a9af989d1d437fc331bf588acbdcd3ab4eec (commit)
via fd343a1a36c4f6ff62f67acfc5506fb2592858b3 (commit)
from 9f1109cbd20189e40fdc5ed007efef48fc3c7fdf (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=dc23a9af989d1d437fc331bf588acbdcd3ab4eec
commit dc23a9af989d1d437fc331bf588acbdcd3ab4eec
Merge: 9f1109c fd343a1
Author: Bill Hoffman
AuthorDate: Tue Sep 21 12:01:56 2010 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 21 12:01:56 2010 -0400
Merge topic 'add_vtk_contract_test' into next
fd343a1 Add a "Contract" test for VTK. The test downloads and builds VTK.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd343a1a36c4f6ff62f67acfc5506fb2592858b3
commit fd343a1a36c4f6ff62f67acfc5506fb2592858b3
Author: Bill Hoffman
AuthorDate: Tue Sep 21 10:23:09 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Sep 21 10:23:09 2010 -0400
Add a "Contract" test for VTK. The test downloads and builds VTK.
The idea is that we can make sure that CMake is staying backwards
compatible by testing projects against CMake as the changes are made
in CMake. Because these tests will take a long time to run, they
will not be enabled by default. Instead, they will be enabled by
putting a cache variable into CMake.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5e88b5c..82ea48b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -11,7 +11,7 @@ MACRO(ADD_TEST_MACRO NAME COMMAND)
--build-generator ${CMAKE_TEST_GENERATOR}
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-project ${proj}
---test-command ${COMMAND})
+--test-command ${COMMAND} ${ARGN})
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${dir}")
ENDMACRO(ADD_TEST_MACRO)
@@ -1757,6 +1757,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
-D source_dir:STRING=${CMAKE_CURRENT_SOURCE_DIR}/Tutorial/Step3
-D CMAKE_CTEST_COMMAND:STRING=${CMAKE_CTEST_COMMAND}
-P ${CMAKE_CURRENT_SOURCE_DIR}/CMakeWizardTest.cmake)
+ # If the cache variable CMAKE_CONTRACT_PROJECTS is set
+ # then the dashboard will run a contract with CMake test of that
+ # name. For example CMAKE_CONTRACT_PROJECTS = vtk542 would run
+ # the vtk542 contract test.
+ FOREACH(project ${CMAKE_CONTRACT_PROJECTS})
+ADD_TEST_MACRO(Contracts.${project}
+ VTK-build/bin/CommonCxxTests otherArrays)
+SET_TESTS_PROPERTIES(Contracts.${project} PROPERTIES TIMEOUT 5400)
+ ENDFOREACH()
ENDIF(BUILD_TESTING)
SUBDIRS(CMakeTests)
diff --git a/Tests/Contracts/vtk542/CMakeLists.txt
b/Tests/Contracts/vtk542/CMakeLists.txt
new file mode 100644
index 000..cfb8b16
--- /dev/null
+++ b/Tests/Contracts/vtk542/CMakeLists.txt
@@ -0,0 +1,30 @@
+# The VTK external project for CMake
+# ---
+cmake_minimum_required(VERSION 2.8)
+project(vtk542)
+include(ExternalProject)
+
+
+set(vtk_source "${CMAKE_CURRENT_BINARY_DIR}/VTK-source")
+set(vtk_binary "${CMAKE_CURRENT_BINARY_DIR}/VTK-build")
+
+ExternalProject_Add(VTK
+ DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}
+ URL "http://www.vtk.org/files/release/5.4/vtk-5.4.2.tar.gz";
+ URL_MD5 c2c797091d4b2128d9a1bd32c4b78227
+ SOURCE_DIR ${vtk_source}
+ BINARY_DIR ${vtk_binary}
+ CMAKE_GENERATOR "${CMAKE_GENERATOR}"
+ CMAKE_ARGS
+ -DBUILD_EXAMPLES:BOOL=ON
+ -DBUILD_TESTING:BOOL=ON
+ INSTALL_COMMAND ""
+ )
+# make it so that each build will run make in the VTK build tree
+ExternalProject_Add_Step(VTK forcebuild
+ COMMAND ${CMAKE_COMMAND}
+ -E remove ${CMAKE_CURRENT_BUILD_DIR}/VTK-prefix/src/VTK-stamp/VTK-build
+ DEPENDEES configure
+ DEPENDERS build
+ ALWAYS 1
+ )
---
Summary of changes:
Tests/CMakeLists.txt | 11 ++-
Tests/Contracts/vtk542/CMakeLists.txt | 30 ++
2 files changed, 40 insertions(+), 1 deletions(-)
create mode 100644 Tests/Contracts/vtk542/CMakeLists.txt
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.2-881-g911c432
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 911c4326bbbe730f417084ebce0030967de686b1 (commit)
via 942ace83935fdb3272e026f21c56a6682b78d6de (commit)
from dc23a9af989d1d437fc331bf588acbdcd3ab4eec (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=911c4326bbbe730f417084ebce0030967de686b1
commit 911c4326bbbe730f417084ebce0030967de686b1
Merge: dc23a9a 942ace8
Author: Bill Hoffman
AuthorDate: Tue Sep 21 15:09:39 2010 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 21 15:09:39 2010 -0400
Merge topic 'add_vtk_contract_test' into next
942ace8 Fix contract test so it is not hard coded to the vtk542 test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=942ace83935fdb3272e026f21c56a6682b78d6de
commit 942ace83935fdb3272e026f21c56a6682b78d6de
Author: Bill Hoffman
AuthorDate: Tue Sep 21 15:08:13 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Sep 21 15:08:13 2010 -0400
Fix contract test so it is not hard coded to the vtk542 test.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 82ea48b..895cb2a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1761,9 +1761,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
# then the dashboard will run a contract with CMake test of that
# name. For example CMAKE_CONTRACT_PROJECTS = vtk542 would run
# the vtk542 contract test.
+ # For each Contract test, the project should provide a directory
+ # with at least one CMakeLists.txt file that uses ExternalProject
+ # to download and configure the project. The directory should also
+ # contain a RunTest.cmake file that has a single set of the format:
+ # SET(project_RUN_TEST testToRun)
+ # The testToRun should be a test executable that can be run to
+ # smoke test the build.
FOREACH(project ${CMAKE_CONTRACT_PROJECTS})
+INCLUDE(Contracts/${project}/RunTest.cmake)
ADD_TEST_MACRO(Contracts.${project}
- VTK-build/bin/CommonCxxTests otherArrays)
+ ${${project}_RUN_TEST})
SET_TESTS_PROPERTIES(Contracts.${project} PROPERTIES TIMEOUT 5400)
ENDFOREACH()
ENDIF(BUILD_TESTING)
diff --git a/Tests/Contracts/vtk542/RunTest.cmake
b/Tests/Contracts/vtk542/RunTest.cmake
new file mode 100644
index 000..4f48e5c
--- /dev/null
+++ b/Tests/Contracts/vtk542/RunTest.cmake
@@ -0,0 +1 @@
+SET(vtk542_RUN_TEST VTK-build/bin/CommonCxxTests otherArrays)
---
Summary of changes:
Tests/CMakeLists.txt | 10 +-
Tests/Contracts/vtk542/RunTest.cmake |1 +
2 files changed, 10 insertions(+), 1 deletions(-)
create mode 100644 Tests/Contracts/vtk542/RunTest.cmake
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.2-949-g6dc009c
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 6dc009c46581435241af70ed54ab17c658ceddf4 (commit)
via 1c2e17f2afe4dfcb2dac543af4a21121722b38f9 (commit)
from ca68ba9354e7f9809b7cdc8c7a93898ab157775d (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=6dc009c46581435241af70ed54ab17c658ceddf4
commit 6dc009c46581435241af70ed54ab17c658ceddf4
Merge: ca68ba9 1c2e17f
Author: Bill Hoffman
AuthorDate: Tue Sep 28 14:38:12 2010 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 28 14:38:12 2010 -0400
Merge topic 'xcode_source_group_fix_7932' into next
1c2e17f XCode Source Grouping now allows for multiple levels of source
groups (7932).
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2e17f2afe4dfcb2dac543af4a21121722b38f9
commit 1c2e17f2afe4dfcb2dac543af4a21121722b38f9
Author: Bill Hoffman
AuthorDate: Mon Sep 27 14:41:47 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Sep 28 14:36:56 2010 -0400
XCode Source Grouping now allows for multiple levels of source groups
(7932).
patch given by goatboy160, and updated by Claus Hofele.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 4e9969d..3603ddf 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2435,26 +2435,68 @@ void
cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
std::vector classes = cmtarget.GetSourceFiles();
- for(std::vector::const_iterator s = classes.begin();
+ for(std::vector::const_iterator s = classes.begin();
s != classes.end(); s++)
{
cmSourceFile* sf = *s;
// Add the file to the list of sources.
std::string const& source = sf->GetFullPath();
-cmSourceGroup& sourceGroup =
+cmSourceGroup& sourceGroup =
mf->FindSourceGroup(source.c_str(), sourceGroups);
-cmXCodeObject* pbxgroup =
- this->CreateOrGetPBXGroup(cmtarget, &sourceGroup);
-cmStdString key = GetGroupMapKey(cmtarget, sf);
-this->GroupMap[key] = pbxgroup;
+sourceGroup.AssignSource( sf );
+}
+
+ // Create all of the groups that should be created for this target.
+ // Loop through every source group.
+ for(unsigned int i = 0; i < sourceGroups.size(); ++i)
+{
+this->CreateSourceGroup( sourceGroups[i], cmtarget, false );
+}
+ }
+}
+}
+
+//
+cmXCodeObject* cmGlobalXCodeGenerator
+::CreateSourceGroup( cmSourceGroup& sg, cmTarget& cmtarget, bool child_group )
+{
+ // Only do something with the group if there are files or child groups
+ if( !sg.GetSourceFiles().empty() || !sg.GetGroupChildren().empty() )
+{
+cmXCodeObject* pbxgroup =
+ this->CreateOrGetPBXGroup(cmtarget, &sg, !child_group);
+
+std::vector& sources = sg.GetSourceFiles();
+// Get all the source files and add them to the GroupMap
+for(std::vector::const_iterator s = sources.begin();
+s != sources.end(); s++)
+ {
+ cmStdString key = GetGroupMapKey(cmtarget, (cmSourceFile*)*s);
+ this->GroupMap[key] = pbxgroup;
+ }
+
+// Do the child groups
+std::vector children = sg.GetGroupChildren();
+cmXCodeObject* groupChildren = pbxgroup->GetObject("children");
+
+for(unsigned int i=0;iCreateSourceGroup( children[i], cmtarget, true );
+ if (group)
+{
+groupChildren->AddObject(group);
}
}
-}
+return pbxgroup;
+}
+ return NULL;
}
+
//
cmXCodeObject* cmGlobalXCodeGenerator
-::CreateOrGetPBXGroup(cmTarget& cmtarget, cmSourceGroup* sg)
+::CreateOrGetPBXGroup(cmTarget& cmtarget, cmSourceGroup* sg, bool child_group)
{
cmStdString s = cmtarget.GetName();
s += "/";
@@ -2496,9 +2538,8 @@ cmXCodeObject* cmGlobalXCodeGenerator
return tgroup;
}
- cmXCodeObject* tgroupChildren = tgroup->GetObject("children");
cmXCodeObject* group = this->CreateObject(cmXCodeObject::PBXGroup);
- cmXCodeObject* groupChildren =
+ cmXCodeObject* groupChildren =
this->CreateObject(cmXCodeObject::OBJECT_LIST);
group->AddAttribute("name", this->CreateString(sg->GetName()));
group->AddAttribute("children", groupChildren);
@@ -2507,7 +2548,11 @@ cmXCodeObject* cmGlobalXC
[Cmake-commits] CMake branch, next, updated. v2.8.2-951-g7075b00
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 7075b00828e015cfb587d1a9141a2fd0ff671fee (commit)
via 4ebc24657eab201a14ee44c41540609bd86a9397 (commit)
from 6dc009c46581435241af70ed54ab17c658ceddf4 (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=7075b00828e015cfb587d1a9141a2fd0ff671fee
commit 7075b00828e015cfb587d1a9141a2fd0ff671fee
Merge: 6dc009c 4ebc246
Author: Bill Hoffman
AuthorDate: Tue Sep 28 16:02:28 2010 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 28 16:02:28 2010 -0400
Merge topic 'xcode_source_group_fix_7932' into next
4ebc246 Fix shadow warning in groups code.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ebc24657eab201a14ee44c41540609bd86a9397
commit 4ebc24657eab201a14ee44c41540609bd86a9397
Author: Bill Hoffman
AuthorDate: Tue Sep 28 16:01:18 2010 -0400
Commit: Bill Hoffman
CommitDate: Tue Sep 28 16:01:18 2010 -0400
Fix shadow warning in groups code.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 3603ddf..78df0e4 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2448,7 +2448,7 @@ void
cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
// Create all of the groups that should be created for this target.
// Loop through every source group.
- for(unsigned int i = 0; i < sourceGroups.size(); ++i)
+ for(unsigned int idx = 0; idx < sourceGroups.size(); ++idx)
{
this->CreateSourceGroup( sourceGroups[i], cmtarget, false );
}
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx |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
