[Cmake-commits] CMake branch, next, updated. v2.8.3-808-ga818b0f
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 a818b0f8778ed31bab695708605d42cc2c0cb4a8 (commit)
via cbdc46356dacb75f1901da44e00ac96c1af24408 (commit)
from c9c1272a165b5e7f081746b975881b404d888586 (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=a818b0f8778ed31bab695708605d42cc2c0cb4a8
commit a818b0f8778ed31bab695708605d42cc2c0cb4a8
Merge: c9c1272 cbdc463
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Sun Dec 12 06:26:53 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Dec 12 06:26:53 2010 -0500
Merge topic 'CPack-AddMoreTests' into next
cbdc463 CPackTest spit out more output in case of failure
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbdc46356dacb75f1901da44e00ac96c1af24408
commit cbdc46356dacb75f1901da44e00ac96c1af24408
Author: Eric NOULARD eric.noul...@gmail.com
AuthorDate: Sun Dec 12 12:19:50 2010 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Sun Dec 12 12:19:50 2010 +0100
CPackTest spit out more output in case of failure
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index b24ae5a..e519893 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -20,14 +20,23 @@ endif(NOT CPackComponentWay)
set(expected_file_mask )
# The usual default behavior is to expect a single file
+# Then some specific generators (Archive, RPM, ...)
+# May produce several numbers of files depending on
+# CPACK_COMPONENT_xxx values
set(expected_count 1)
execute_process(COMMAND ${CPackCommand} -G ${CPackGen}
-RESULT_VARIABLE result
-OUTPUT_VARIABLE stdout
-ERROR_VARIABLE stderr
+RESULT_VARIABLE CPack_result
+OUTPUT_VARIABLE CPack_output
+ERROR_VARIABLE CPack_error
WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR})
+if (CPack_result)
+ message(SEND_ERROR CPack_output=${CPack_output})
+ message(SEND_ERROR CPack_error=${CPack_error})
+ message(FATAL_ERROR error: CPack execution went wrong!)
+endif(CPack_result)
+
if(CPackGen MATCHES ZIP)
set(expected_file_mask ${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip)
if (${CPackComponentWay} STREQUAL default)
@@ -46,12 +55,16 @@ if(expected_file_mask)
message(STATUS expected_file_mask='${expected_file_mask}')
if(NOT expected_file)
+message(SEND_ERROR CPack_output=${CPack_output})
+message(SEND_ERROR CPack_error=${CPack_error})
message(FATAL_ERROR error: expected_file=${expected_file} does not exist:
CPackComponentsForAll test fails.)
endif(NOT expected_file)
list(LENGTH expected_file actual_count)
message(STATUS actual_count='${actual_count}')
if(NOT actual_count EQUAL expected_count)
+message(SEND_ERROR CPack_output=${CPack_output})
+message(SEND_ERROR CPack_error=${CPack_error})
message(FATAL_ERROR error: expected_count=${expected_count} does not
match actual_count=${actual_count}: CPackComponents test fails.)
endif(NOT actual_count EQUAL expected_count)
endif(expected_file_mask)
---
Summary of changes:
.../RunCPackVerifyResult.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.3-812-gbc94ecc
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 bc94eccac2f2d5adf4c154d90ebe64bdafc39b83 (commit)
via 17b05e6d7f3460734d750756768e26a214c0cac6 (commit)
via 1b98d99c28949347c7c6a1e5ee67ee8e49670277 (commit)
via da4c2f6214e8c86c7fa2a49095e7672ea377c8c2 (commit)
from a818b0f8778ed31bab695708605d42cc2c0cb4a8 (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=bc94eccac2f2d5adf4c154d90ebe64bdafc39b83
commit bc94eccac2f2d5adf4c154d90ebe64bdafc39b83
Merge: a818b0f 17b05e6
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Sun Dec 12 06:37:12 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Dec 12 06:37:12 2010 -0500
Merge topic 'CPack-DynMONOLITHIC_INSTALL' into next
17b05e6 CPack Honor CPACK_MONOLITHIC_INSTALL at CPack time too
1b98d99 KWSys Nightly Date Stamp
da4c2f6 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17b05e6d7f3460734d750756768e26a214c0cac6
commit 17b05e6d7f3460734d750756768e26a214c0cac6
Author: Eric NOULARD eric.noul...@gmail.com
AuthorDate: Sun Dec 12 12:30:42 2010 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Sun Dec 12 12:30:42 2010 +0100
CPack Honor CPACK_MONOLITHIC_INSTALL at CPack time too
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 92e5b6a..71a2a0f 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -551,7 +551,14 @@ int
cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
std::vectorstd::string componentsVector;
bool componentInstall = false;
- if (this-SupportsComponentInstallation())
+ /*
+ * We do a component install iff
+ *- the CPack generator support component
+ *- the user did not request Monolithic install
+ * (this works at CPack time too)
+ */
+ if (this-SupportsComponentInstallation()
+ !(this-IsSet(CPACK_MONOLITHIC_INSTALL)))
{
// Determine the installation types for this project (if provided).
std::string installTypesVar = CPACK_
---
Summary of changes:
Source/CPack/cmCPackGenerator.cxx |9 -
Source/kwsys/kwsysDateStamp.cmake |2 +-
2 files changed, 9 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.3-816-g535022e
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 535022eebeab876ada2399071e6541f85a6372b0 (commit)
via 3ce00499d4471ba2b294bea074aea872f91c741f (commit)
from 25546df6c7a0f5120b2dcc2af99b4ddcbf6dbf71 (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=535022eebeab876ada2399071e6541f85a6372b0
commit 535022eebeab876ada2399071e6541f85a6372b0
Merge: 25546df 3ce0049
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Sun Dec 12 08:46:18 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Dec 12 08:46:18 2010 -0500
Merge topic 'FixDocTypoInFindFLEX' into next
3ce0049 Fix typos in the doc
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ce00499d4471ba2b294bea074aea872f91c741f
commit 3ce00499d4471ba2b294bea074aea872f91c741f
Author: Alex Neundorf neund...@kde.org
AuthorDate: Tue Dec 7 21:13:25 2010 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Tue Dec 7 21:13:25 2010 +0100
Fix typos in the doc
Alex
diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 272cdc7..ff6b085 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -36,8 +36,8 @@
# find_package(BISON)
# find_package(FLEX)
#
-# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp
-# FLEX_TARGET(MyScanner lexer.l ${CMAKE_CURRENT_BIANRY_DIR}/lexer.cpp)
+# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp)
+# FLEX_TARGET(MyScanner lexer.l ${CMAKE_CURRENT_BINARY_DIR}/lexer.cpp)
# ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser)
#
# include_directories(${CMAKE_CURRENT_BINARY_DIR})
---
Summary of changes:
Modules/FindFLEX.cmake |4 ++--
1 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.3-818-gf12dc41
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 f12dc41ae44d20bbab965a439894081c66e4acca (commit)
via 50d21d4251b179707b4569e5cfff0c9e65432273 (commit)
from 535022eebeab876ada2399071e6541f85a6372b0 (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=f12dc41ae44d20bbab965a439894081c66e4acca
commit f12dc41ae44d20bbab965a439894081c66e4acca
Merge: 535022e 50d21d4
Author: Alexander Neundorf neund...@kde.org
AuthorDate: Sun Dec 12 10:56:19 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Dec 12 10:56:19 2010 -0500
Merge topic 'ParallelEclipseMakefiles2' into next
50d21d4 Add cache var CMAKE_ECLIPSE_MAKE_ARGUMENTS when using the Eclipse
generator
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50d21d4251b179707b4569e5cfff0c9e65432273
commit 50d21d4251b179707b4569e5cfff0c9e65432273
Author: Alex Neundorf neund...@kde.org
AuthorDate: Sun Dec 12 16:52:20 2010 +0100
Commit: Alex Neundorf neund...@kde.org
CommitDate: Sun Dec 12 16:52:20 2010 +0100
Add cache var CMAKE_ECLIPSE_MAKE_ARGUMENTS when using the Eclipse generator
This variable can be set to command line arguments which will be passed
to make when eclipse invokes make, e.g. you can enter -j8 to get
8 parallel builds (#9930)
Alex
diff --git a/Modules/CMakeFindEclipseCDT4.cmake
b/Modules/CMakeFindEclipseCDT4.cmake
index 836e4c9..b2a0299 100644
--- a/Modules/CMakeFindEclipseCDT4.cmake
+++ b/Modules/CMakeFindEclipseCDT4.cmake
@@ -17,6 +17,8 @@
FIND_PROGRAM(CMAKE_ECLIPSE_EXECUTABLE NAMES eclipse DOC The Eclipse
executable)
+# This variable is used by the Eclipse generator and appended to the make
invocation commands.
+SET(CMAKE_ECLIPSE_MAKE_ARGUMENTS CACHE STRING Additional command line
arguments when Eclipse invokes make. Enter e.g. -jsome_number to get parallel
builds)
# The Eclipse generator needs to know the standard include path
# so that Eclipse ca find the headers at runtime and parsing etc. works better
diff --git a/Source/cmExtraEclipseCDT4Generator.cxx
b/Source/cmExtraEclipseCDT4Generator.cxx
index 8f89b5e..502fefa 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -734,6 +734,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
;
emmited.clear();
const std::string make = mf-GetRequiredDefinition(CMAKE_MAKE_PROGRAM);
+ const std::string makeArgs = mf-GetSafeDefinition(
+ CMAKE_ECLIPSE_MAKE_ARGUMENTS);
cmGlobalGenerator* generator
= const_castcmGlobalGenerator*(this-GlobalGenerator);
@@ -794,7 +796,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
}
if (insertTarget)
{
- this-AppendTarget(fout, ti-first, make, subdir, : );
+ this-AppendTarget(fout, ti-first, make, makeArgs, subdir, : );
}
}
break;
@@ -809,7 +811,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
break;
}
- this-AppendTarget(fout, ti-first, make, subdir, : );
+ this-AppendTarget(fout, ti-first, make, makeArgs, subdir, : );
break;
case cmTarget::EXECUTABLE:
case cmTarget::STATIC_LIBRARY:
@@ -818,10 +820,10 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile()
const
{
const char* prefix = (ti-second.GetType()==cmTarget::EXECUTABLE ?
[exe] : [lib] );
- this-AppendTarget(fout, ti-first, make, subdir, prefix);
+ this-AppendTarget(fout, ti-first, make, makeArgs, subdir, prefix);
std::string fastTarget = ti-first;
fastTarget += /fast;
- this-AppendTarget(fout, fastTarget, make, subdir, prefix);
+ this-AppendTarget(fout, fastTarget, make, makeArgs, subdir, prefix);
}
break;
// ignore these:
@@ -836,11 +838,11 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile()
const
// insert the all and clean targets in every subdir
if (!allTarget.empty())
{
- this-AppendTarget(fout, allTarget, make, subdir, : );
+ this-AppendTarget(fout, allTarget, make, makeArgs, subdir, : );
}
if (!cleanTarget.empty())
{
- this-AppendTarget(fout, cleanTarget, make, subdir, : );
+ this-AppendTarget(fout, cleanTarget, make, makeArgs, subdir, : );
}
//insert rules for compiling, preprocessing and assembling individual files
@@ -860,7 +862,7 @@ void
[Cmake-commits] CMake branch, next, updated. v2.8.3-820-g3406737
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 3406737f96ce4513a640519210d8ace677ede0ca (commit)
via 66de27fcab89170d1cb3209786bfb37a702c2963 (commit)
from f12dc41ae44d20bbab965a439894081c66e4acca (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=3406737f96ce4513a640519210d8ace677ede0ca
commit 3406737f96ce4513a640519210d8ace677ede0ca
Merge: f12dc41 66de27f
Author: Eric Noulard eric.noul...@gmail.com
AuthorDate: Sun Dec 12 17:05:47 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Dec 12 17:05:47 2010 -0500
Merge topic 'CPack-AddMoreTests' into next
66de27f Arrange output in a better way
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66de27fcab89170d1cb3209786bfb37a702c2963
commit 66de27fcab89170d1cb3209786bfb37a702c2963
Author: Eric NOULARD eric.noul...@gmail.com
AuthorDate: Sun Dec 12 22:35:18 2010 +0100
Commit: Eric NOULARD eric.noul...@gmail.com
CommitDate: Sun Dec 12 22:35:18 2010 +0100
Arrange output in a better way
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index e519893..ee6b227 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -32,9 +32,9 @@ execute_process(COMMAND ${CPackCommand} -G ${CPackGen}
WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR})
if (CPack_result)
- message(SEND_ERROR CPack_output=${CPack_output})
- message(SEND_ERROR CPack_error=${CPack_error})
- message(FATAL_ERROR error: CPack execution went wrong!)
+ message(FATAL_ERROR error: CPack execution went wrong!,
CPack_output=${CPack_output}, CPack_error=${CPack_error})
+else (CPack_result)
+ message(STATUS CPack_output=${CPack_output})
endif(CPack_result)
if(CPackGen MATCHES ZIP)
@@ -55,16 +55,12 @@ if(expected_file_mask)
message(STATUS expected_file_mask='${expected_file_mask}')
if(NOT expected_file)
-message(SEND_ERROR CPack_output=${CPack_output})
-message(SEND_ERROR CPack_error=${CPack_error})
-message(FATAL_ERROR error: expected_file=${expected_file} does not exist:
CPackComponentsForAll test fails.)
+message(FATAL_ERROR error: expected_file=${expected_file} does not exist:
CPackComponentsForAll test fails. (CPack_output=${CPack_output},
CPack_error=${CPack_error})
endif(NOT expected_file)
list(LENGTH expected_file actual_count)
message(STATUS actual_count='${actual_count}')
if(NOT actual_count EQUAL expected_count)
-message(SEND_ERROR CPack_output=${CPack_output})
-message(SEND_ERROR CPack_error=${CPack_error})
-message(FATAL_ERROR error: expected_count=${expected_count} does not
match actual_count=${actual_count}: CPackComponents test fails.)
+message(FATAL_ERROR error: expected_count=${expected_count} does not
match actual_count=${actual_count}: CPackComponents test fails.
(CPack_output=${CPack_output}, CPack_error=${CPack_error}))
endif(NOT actual_count EQUAL expected_count)
endif(expected_file_mask)
---
Summary of changes:
.../RunCPackVerifyResult.cmake | 14 +-
1 files changed, 5 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.3-169-gb5d7f2c
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 b5d7f2c57c4ce50f7cfdaef7133df40ff6269c4c (commit) from 1b98d99c28949347c7c6a1e5ee67ee8e49670277 (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=b5d7f2c57c4ce50f7cfdaef7133df40ff6269c4c commit b5d7f2c57c4ce50f7cfdaef7133df40ff6269c4c Author: KWSys Robot kwro...@kitware.com AuthorDate: Mon Dec 13 00:01:03 2010 -0500 Commit: KWSys Robot kwro...@kitware.com CommitDate: Mon Dec 13 00:10:05 2010 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 5f8a661..c6a844f 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 12) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 12) +SET(KWSYS_DATE_STAMP_DAY 13) --- Summary of changes: Source/kwsys/kwsysDateStamp.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.3-827-g1f70d7a
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 1f70d7aa3829e8fab044a33f457449febab3180d (commit)
via a80d6e9828b3089519fedbd4eee4c199ce3b8597 (commit)
from dda80352ba5f2cf94933a9e603d393ccc1442b02 (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=1f70d7aa3829e8fab044a33f457449febab3180d
commit 1f70d7aa3829e8fab044a33f457449febab3180d
Merge: dda8035 a80d6e9
Author: Philip Lowman phi...@yhbt.com
AuthorDate: Mon Dec 13 01:23:36 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 13 01:23:36 2010 -0500
Merge topic '11445-workaround' into next
a80d6e9 Add Boost 1.46
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a80d6e9828b3089519fedbd4eee4c199ce3b8597
commit a80d6e9828b3089519fedbd4eee4c199ce3b8597
Author: Philip Lowman phi...@yhbt.com
AuthorDate: Mon Dec 13 01:21:46 2010 -0500
Commit: Philip Lowman phi...@yhbt.com
CommitDate: Mon Dec 13 01:21:46 2010 -0500
Add Boost 1.46
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index dd16f1e..8930405 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -65,7 +65,7 @@
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0,
-# 1.45, 1.45.0
+# 1.45, 1.45.0, 1.46, 1.46.0
#
# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you
should
# add both 1.x and 1.x.0 as shown above. Official Boost include directories
@@ -378,7 +378,7 @@ else(Boost_FIND_VERSION_EXACT)
# The user has not requested an exact version. Among known
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-1.45.0 1.45 1.44.0 1.44 1.43.0 1.43 1.42.0 1.42
+1.46.0 1.46 1.45.0 1.45 1.44.0 1.44 1.43.0 1.43 1.42.0
1.42
1.41.0 1.41 1.40.0 1.40 1.39.0 1.39 1.38.0 1.38 1.37.0
1.37
1.36.1 1.36.0 1.36 1.35.1 1.35.0 1.35 1.34.1 1.34.0
1.34 1.33.1 1.33.0 1.33)
---
Summary of changes:
Modules/FindBoost.cmake |4 ++--
1 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
