[Cmake-commits] CMake branch, master, updated. v3.1.0-rc1-90-gf274597
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via f274597abba00d4ae7947a9212e1db56ee801c4c (commit) from f2746f2ebec8f929986f5a7abc5e9285a7553097 (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=f274597abba00d4ae7947a9212e1db56ee801c4c commit f274597abba00d4ae7947a9212e1db56ee801c4c Author: Kitware Robot AuthorDate: Fri Oct 31 00:01:08 2014 -0400 Commit: Kitware Robot CommitDate: Fri Oct 31 00:01:08 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index fc5353f..cefec9f 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 1) -set(CMake_VERSION_PATCH 20141030) +set(CMake_VERSION_PATCH 20141031) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.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.0-rc1-231-gd09a1e3
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 d09a1e30cc63119df91a8b69761d81cb352d7244 (commit) via f2746f2ebec8f929986f5a7abc5e9285a7553097 (commit) via 5e27e6f896976e1d167548f740f46d1477c8c48c (commit) via b233a09f6e9bed46b65079a2d78d865b816b79c7 (commit) via 927b59403fe522d02308c7c5cc14d0c9d14f5b21 (commit) via 6e1e7dd01499d11ae949f73b061dedf3bae7b6a9 (commit) via 89fd4b82d17b1072c6c4852087a2f01b66600e8d (commit) via 2e953c76573b5e146ce77ee807e4b1d2f4f60ed3 (commit) from 51ef964615855d4fad76bf681b8c1a3f0ddb9882 (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=d09a1e30cc63119df91a8b69761d81cb352d7244 commit d09a1e30cc63119df91a8b69761d81cb352d7244 Merge: 51ef964 f2746f2 Author: Brad King AuthorDate: Thu Oct 30 14:18:20 2014 -0400 Commit: Brad King CommitDate: Thu Oct 30 14:18:20 2014 -0400 Merge branch 'master' into next --- 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.1.0-rc1-223-g51ef964
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 51ef964615855d4fad76bf681b8c1a3f0ddb9882 (commit)
via 8d6ba35827bc4025a39acace8b65f2de96613a8a (commit)
from 50ffef22728c91aab4a5013790783f1e6cb1fff2 (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=51ef964615855d4fad76bf681b8c1a3f0ddb9882
commit 51ef964615855d4fad76bf681b8c1a3f0ddb9882
Merge: 50ffef2 8d6ba35
Author: Brad King
AuthorDate: Thu Oct 30 14:17:10 2014 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 30 14:17:10 2014 -0400
Merge topic 'CheckStructHasMember-avoid-breakage-on-Wall' into next
8d6ba358 CheckStructHasMember: Avoid clang -Wall breakage (#15203)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d6ba35827bc4025a39acace8b65f2de96613a8a
commit 8d6ba35827bc4025a39acace8b65f2de96613a8a
Author: Peter Wu
AuthorDate: Thu Oct 30 18:49:09 2014 +0100
Commit: Brad King
CommitDate: Thu Oct 30 14:16:06 2014 -0400
CheckStructHasMember: Avoid clang -Wall breakage (#15203)
With CMAKE_C_COMPILER=clang and CMAKE_C_FLAGS='-Wall -Werror', this test
breaks with -Werror,-Wuninitialized. Fix this by getting rid of the
temporary variable.
diff --git a/Modules/CheckStructHasMember.cmake
b/Modules/CheckStructHasMember.cmake
index c8949cf..de31d2c 100644
--- a/Modules/CheckStructHasMember.cmake
+++ b/Modules/CheckStructHasMember.cmake
@@ -69,8 +69,7 @@ macro (CHECK_STRUCT_HAS_MEMBER _STRUCT _MEMBER _HEADER
_RESULT)
${_INCLUDE_FILES}
int main()
{
- ${_STRUCT}* tmp;
- (void) tmp->${_MEMBER};
+ (void)((${_STRUCT} *)0)->${_MEMBER};
return 0;
}
")
---
Summary of changes:
Modules/CheckStructHasMember.cmake |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, master, updated. v3.1.0-rc1-87-g5e27e6f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 5e27e6f896976e1d167548f740f46d1477c8c48c (commit) via 352cbb6e360eccca050aebdc77868558821564af (commit) via a9f8c50aa208c4bd4ed4586f8d27cf423bb81c47 (commit) from b233a09f6e9bed46b65079a2d78d865b816b79c7 (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=5e27e6f896976e1d167548f740f46d1477c8c48c commit 5e27e6f896976e1d167548f740f46d1477c8c48c Merge: b233a09 352cbb6 Author: Brad King AuthorDate: Thu Oct 30 14:11:57 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Oct 30 14:11:57 2014 -0400 Merge topic 'doc-add_compile_options' 352cbb6e Help: Reference add_compile_options from add_definitions (#15225) a9f8c50a Help: Clarify add_compile_options documentation (#15225) --- Summary of changes: Help/command/add_compile_options.rst | 15 --- Help/command/add_definitions.rst | 10 ++ Help/prop_dir/COMPILE_OPTIONS.rst|6 +++--- 3 files changed, 17 insertions(+), 14 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, master, updated. v3.1.0-rc1-79-g6e1e7dd
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 6e1e7dd01499d11ae949f73b061dedf3bae7b6a9 (commit) via 5bd29b8889995089242f0f9f80fdb70e1e9ae88c (commit) from 89fd4b82d17b1072c6c4852087a2f01b66600e8d (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=6e1e7dd01499d11ae949f73b061dedf3bae7b6a9 commit 6e1e7dd01499d11ae949f73b061dedf3bae7b6a9 Merge: 89fd4b8 5bd29b8 Author: Brad King AuthorDate: Thu Oct 30 14:11:51 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Oct 30 14:11:51 2014 -0400 Merge topic 'wince-tests' 5bd29b88 Tests: Run Tutorial steps 1-4 as tests for Windows CE --- Summary of changes: Tests/CMakeLists.txt | 53 +- 1 file changed, 52 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, master, updated. v3.1.0-rc1-89-gf2746f2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via f2746f2ebec8f929986f5a7abc5e9285a7553097 (commit) via f04e0a2b178ec95138a2fbb7d4f5623ca41385e2 (commit) from 5e27e6f896976e1d167548f740f46d1477c8c48c (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=f2746f2ebec8f929986f5a7abc5e9285a7553097 commit f2746f2ebec8f929986f5a7abc5e9285a7553097 Merge: 5e27e6f f04e0a2 Author: Brad King AuthorDate: Thu Oct 30 14:11:59 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Oct 30 14:11:59 2014 -0400 Merge topic 'dev/alternate-generator-binaries' f04e0a2b ninja: Find alternate Ninja-compatible binaries --- Summary of changes: Modules/CMakeNinjaFindMake.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, master, updated. v3.1.0-rc1-75-g2e953c7
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 2e953c76573b5e146ce77ee807e4b1d2f4f60ed3 (commit)
via aee7e4a03b8b410212e2eae23d1ecc182c8da817 (commit)
via 368e8de4cd5a5d97c9b5e81489bf014579211bda (commit)
from 5c5c1e3c7dee614ab108a8809507a907a629a9d3 (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=2e953c76573b5e146ce77ee807e4b1d2f4f60ed3
commit 2e953c76573b5e146ce77ee807e4b1d2f4f60ed3
Merge: 5c5c1e3 aee7e4a
Author: Brad King
AuthorDate: Thu Oct 30 14:11:48 2014 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 30 14:11:48 2014 -0400
Merge topic 'fix--D-command-line-parsing'
aee7e4a0 cmCacheManager: parse -D flags more strictly
368e8de4 Tests: test -D parsing on the command line
---
Summary of changes:
Source/cmCacheManager.cxx |2 +-
Tests/RunCMake/{CMP0054 => CommandLine}/CMakeLists.txt |0
Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt |1 +
Tests/RunCMake/CommandLine/D_nested_cache.cmake|1 +
Tests/RunCMake/CommandLine/D_typed_nested_cache-stderr.txt |1 +
Tests/RunCMake/CommandLine/D_typed_nested_cache.cmake |1 +
Tests/RunCMake/CommandLine/RunCMakeTest.cmake |8
7 files changed, 13 insertions(+), 1 deletion(-)
copy Tests/RunCMake/{CMP0054 => CommandLine}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/CommandLine/D_nested_cache-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/D_nested_cache.cmake
create mode 100644 Tests/RunCMake/CommandLine/D_typed_nested_cache-stderr.txt
create mode 100644 Tests/RunCMake/CommandLine/D_typed_nested_cache.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, master, updated. v3.1.0-rc1-84-gb233a09
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via b233a09f6e9bed46b65079a2d78d865b816b79c7 (commit) via fb13502fca5a344dd35be6fc919ae7e89ce9c6ea (commit) via fcb4541a05ea068715c8815c0294d2638721b071 (commit) from 927b59403fe522d02308c7c5cc14d0c9d14f5b21 (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=b233a09f6e9bed46b65079a2d78d865b816b79c7 commit b233a09f6e9bed46b65079a2d78d865b816b79c7 Merge: 927b594 fb13502 Author: Brad King AuthorDate: Thu Oct 30 14:11:56 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Oct 30 14:11:56 2014 -0400 Merge topic 'unix-icon-install' fb13502f QtDialog: install the 128x128 icon fcb4541a QtDialog: don't install desktop file bits on Apple --- Summary of changes: Source/QtDialog/CMake.desktop |2 +- Source/QtDialog/CMakeLists.txt | 10 -- 2 files changed, 9 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, master, updated. v3.1.0-rc1-81-g927b594
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 927b59403fe522d02308c7c5cc14d0c9d14f5b21 (commit) via ca83c39ce0732237c175f60e6d5b204ce5f907e7 (commit) from 6e1e7dd01499d11ae949f73b061dedf3bae7b6a9 (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=927b59403fe522d02308c7c5cc14d0c9d14f5b21 commit 927b59403fe522d02308c7c5cc14d0c9d14f5b21 Merge: 6e1e7dd ca83c39 Author: Brad King AuthorDate: Thu Oct 30 14:11:53 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Oct 30 14:11:53 2014 -0400 Merge topic 'doc-fix-html-favicon' ca83c39c Utilities/Sphinx: Fix html_favicon configuration --- Summary of changes: Utilities/Sphinx/conf.py.in |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.0-rc1-221-g50ffef2
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 50ffef22728c91aab4a5013790783f1e6cb1fff2 (commit)
via 9a8b76693d2a4af504111234e1bae4cfeab7bd71 (commit)
from 0d58a36ede819753219c5f417db001182ade3ff9 (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=50ffef22728c91aab4a5013790783f1e6cb1fff2
commit 50ffef22728c91aab4a5013790783f1e6cb1fff2
Merge: 0d58a36 9a8b766
Author: Brad King
AuthorDate: Thu Oct 30 14:11:23 2014 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 30 14:11:23 2014 -0400
Merge topic 'VERSION_no_sscanf' into next
9a8b7669 cmSystemTools: Use const_cast more locally
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a8b76693d2a4af504111234e1bae4cfeab7bd71
commit 9a8b76693d2a4af504111234e1bae4cfeab7bd71
Author: Brad King
AuthorDate: Thu Oct 30 14:10:30 2014 -0400
Commit: Brad King
CommitDate: Thu Oct 30 14:10:30 2014 -0400
cmSystemTools: Use const_cast more locally
It is only needed for the second argument to strtoul. Avoid casting
earlier to keep the safety checks elsewhere.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3abbc37..3247f7f 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2634,16 +2634,16 @@ bool cmSystemTools::ChangeRPath(std::string const& file,
bool cmSystemTools::VersionCompare(cmSystemTools::CompareOp op,
const char* lhss, const char* rhss)
{
- char *endl = const_cast(lhss);
- char *endr = const_cast(rhss);
+ const char *endl = lhss;
+ const char *endr = rhss;
unsigned long lhs, rhs;
while (((*endl >= '0') && (*endl <= '9')) ||
((*endr >= '0') && (*endr <= '9')))
{
// Do component-wise comparison.
-lhs = strtoul(endl, &endl, 10);
-rhs = strtoul(endr, &endr, 10);
+lhs = strtoul(endl, const_cast(&endl), 10);
+rhs = strtoul(endr, const_cast(&endr), 10);
if(lhs < rhs)
{
---
Summary of changes:
Source/cmSystemTools.cxx |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, master, updated. v3.1.0-rc1-77-g89fd4b8
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 89fd4b82d17b1072c6c4852087a2f01b66600e8d (commit) via bd3fbf36b4da6a160d13eac37732377a9b123c6f (commit) from 2e953c76573b5e146ce77ee807e4b1d2f4f60ed3 (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=89fd4b82d17b1072c6c4852087a2f01b66600e8d commit 89fd4b82d17b1072c6c4852087a2f01b66600e8d Merge: 2e953c7 bd3fbf3 Author: Brad King AuthorDate: Thu Oct 30 14:11:50 2014 -0400 Commit: CMake Topic Stage CommitDate: Thu Oct 30 14:11:50 2014 -0400 Merge topic 'cpack-bundle-codesign' bd3fbf36 CPack: Add support for code signing of bundles on MacOS --- Summary of changes: Modules/CPackBundle.cmake | 25 ++ Source/CPack/cmCPackBundleGenerator.cxx | 126 ++- Source/CPack/cmCPackBundleGenerator.h |2 + 3 files changed, 152 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-rc1-219-g0d58a36
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 0d58a36ede819753219c5f417db001182ade3ff9 (commit)
via fdbfbaaa3297b5a7f32a52822d9d80319ccfe7ff (commit)
via 8c951a35da6bc6554e596a6e07d3db1e61cd7877 (commit)
via ff7da72d3271cb9d4b1760c9c5a45b326027ee3c (commit)
via b3bd0fb10ce3a449477913278646997bef23a988 (commit)
from 2d1d312f9812366f5a84edfc3aecd3566f62b60a (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=0d58a36ede819753219c5f417db001182ade3ff9
commit 0d58a36ede819753219c5f417db001182ade3ff9
Merge: 2d1d312 fdbfbaa
Author: Daniele E. Domenichelli
AuthorDate: Thu Oct 30 13:46:53 2014 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 30 13:46:53 2014 -0400
Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS' into next
fdbfbaaa Extend ExternalProjectLocal test to cover CMAKE_CACHE_DEFAULT_ARGS
8c951a35 Fix Tutorial tests when USE_MYMATH is OFF
ff7da72d ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGS
b3bd0fb1 ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS arguments
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdbfbaaa3297b5a7f32a52822d9d80319ccfe7ff
commit fdbfbaaa3297b5a7f32a52822d9d80319ccfe7ff
Author: Daniele E. Domenichelli
AuthorDate: Thu Oct 30 12:34:34 2014 +0100
Commit: Daniele E. Domenichelli
CommitDate: Thu Oct 30 18:24:15 2014 +0100
Extend ExternalProjectLocal test to cover CMAKE_CACHE_DEFAULT_ARGS
diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt
b/Tests/ExternalProjectLocal/CMakeLists.txt
index f942197..cbbb555 100644
--- a/Tests/ExternalProjectLocal/CMakeLists.txt
+++ b/Tests/ExternalProjectLocal/CMakeLists.txt
@@ -66,6 +66,7 @@ if(can_build_tutorial_step5)
ExternalProject_Add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= -G ${CMAKE_GENERATOR}
+CMAKE_CACHE_DEFAULT_ARGS -DUSE_MYMATH:BOOL=OFF
TEST_AFTER_INSTALL 1
LOG_TEST 1
)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c951a35da6bc6554e596a6e07d3db1e61cd7877
commit 8c951a35da6bc6554e596a6e07d3db1e61cd7877
Author: Daniele E. Domenichelli
AuthorDate: Thu Oct 30 12:23:27 2014 +0100
Commit: Daniele E. Domenichelli
CommitDate: Thu Oct 30 18:24:14 2014 +0100
Fix Tutorial tests when USE_MYMATH is OFF
Unit tests for the square root of "-25" currently fail when USE_MYMATH
is disabled. The "mysqrt" method in the tutorials, returns "0" for a
negative value, while "sqrt" returns "NaN", and therefore the output is
not accepted by the test.
This patch checks if the number is negative and eventually returns "0"
before calling "sqrt" or "mysqrt" to fix this issue.
Printing a NaN might cause issues with the string catched by the tests
on some platform. Therefore assume that "0" is correct and "fix" the
USE_MYMATH=OFF version by checking if the number is negative and
eventually returning "0" before calling "sqrt" or "mysqrt".
diff --git a/Tests/Tutorial/Step2/tutorial.cxx
b/Tests/Tutorial/Step2/tutorial.cxx
index 82b416f..c27da0b 100644
--- a/Tests/Tutorial/Step2/tutorial.cxx
+++ b/Tests/Tutorial/Step2/tutorial.cxx
@@ -21,12 +21,16 @@ int main (int argc, char *argv[])
}
double inputValue = atof(argv[1]);
+ double outputValue = 0;
+ if(inputValue >= 0)
+{
#ifdef USE_MYMATH
- double outputValue = mysqrt(inputValue);
+outputValue = mysqrt(inputValue);
#else
- double outputValue = sqrt(inputValue);
+outputValue = sqrt(inputValue);
#endif
+}
fprintf(stdout,"The square root of %g is %g\n",
inputValue, outputValue);
diff --git a/Tests/Tutorial/Step3/tutorial.cxx
b/Tests/Tutorial/Step3/tutorial.cxx
index 82b416f..c27da0b 100644
--- a/Tests/Tutorial/Step3/tutorial.cxx
+++ b/Tests/Tutorial/Step3/tutorial.cxx
@@ -21,12 +21,16 @@ int main (int argc, char *argv[])
}
double inputValue = atof(argv[1]);
+ double outputValue = 0;
+ if(inputValue >= 0)
+{
#ifdef USE_MYMATH
- double outputValue = mysqrt(inputValue);
+outputValue = mysqrt(inputValue);
#else
- double outputValue = sqrt(inputValue);
+outputValue = sqrt(inputValue);
#endif
+}
fprintf(stdout,"The square root of %g is %g\n",
inputValue, outputValue);
diff --git a/Tests/Tutorial/Step4/tutorial.cxx
b/Tests/Tutorial/Step4/tutorial.cxx
index 82b416f..c27da0b 100644
--- a/Tests/Tutorial/Step4/tutorial.cxx
+++ b/Tests/Tutorial/Step4/tutorial.cxx
@@ -21,12 +21,16 @@ int main (int argc, char *argv[])
}
double inputValue = atof(argv[1]);
+
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-214-g2d1d312
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 2d1d312f9812366f5a84edfc3aecd3566f62b60a (commit)
via 3563e4d356a9981576c3894838deabcd4470 (commit)
via 5c5c1e3c7dee614ab108a8809507a907a629a9d3 (commit)
from d62a6161aeca493054c4c42bab90897d41f505b1 (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=2d1d312f9812366f5a84edfc3aecd3566f62b60a
commit 2d1d312f9812366f5a84edfc3aecd3566f62b60a
Merge: d62a616 3563e4d
Author: Brad King
AuthorDate: Thu Oct 30 13:35:20 2014 -0400
Commit: CMake Topic Stage
CommitDate: Thu Oct 30 13:35:20 2014 -0400
Merge topic 'xcode-inherit-warning-flags' into next
3563e4d3 Xcode: Inherit global settings in per-target WARNING_CFLAGS
(#15224)
5c5c1e3c CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3563e4d356a9981576c3894838deabcd4470
commit 3563e4d356a9981576c3894838deabcd4470
Author: Brad King
AuthorDate: Thu Oct 30 12:38:15 2014 -0400
Commit: Brad King
CommitDate: Thu Oct 30 12:38:15 2014 -0400
Xcode: Inherit global settings in per-target WARNING_CFLAGS (#15224)
Allow projects to use CMAKE_CODE_ATTRIBUTE_WARNING_CFLAGS to add their
own warning flags and have them used by the targets.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 13e6988..5e7a898 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2314,6 +2314,7 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
group->AddObject(this->CreateString("-Wmost"));
group->AddObject(this->CreateString("-Wno-four-char-constants"));
group->AddObject(this->CreateString("-Wno-unknown-pragmas"));
+group->AddObject(this->CreateString("$(inherited)"));
buildSettings->AddAttribute("WARNING_CFLAGS", group);
}
else
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmGlobalXCodeGenerator.cxx |1 +
2 files 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
