[Cmake-commits] CMake branch, next, updated. v2.8.7-2505-g778fdbe

Eric Noulard eric.noulard at gmail.com
Wed Feb 8 10:53:24 EST 2012


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  778fdbe96bea2bbbc3c3e7ef07f7a841a4786eec (commit)
       via  e9ae2df364eea83707fa6759e1cabe9a39b205e9 (commit)
      from  85138471659200d3650ea7b7d0a000ce1c873755 (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=778fdbe96bea2bbbc3c3e7ef07f7a841a4786eec
commit 778fdbe96bea2bbbc3c3e7ef07f7a841a4786eec
Merge: 8513847 e9ae2df
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed Feb 8 10:53:19 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 8 10:53:19 2012 -0500

    Merge topic 'ImproveCPackDoc-reloaded' into next
    
    e9ae2df Avoid discovering system infos for documentation. Adding some path is enough.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9ae2df364eea83707fa6759e1cabe9a39b205e9
commit e9ae2df364eea83707fa6759e1cabe9a39b205e9
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Feb 7 16:59:04 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Feb 7 16:59:04 2012 +0100

    Avoid discovering system infos for documentation. Adding some path is enough.

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 3182915..c541610 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -304,30 +304,31 @@ int main (int argc, char *argv[])
       help = false;
     }
 
-  // find out which system cpack is running on, so it can setup the search
-  // paths, so FIND_XXX() commands can be used in scripts
   // This part is used for cpack documentation lookup as well.
   cminst.AddCMakePaths();
-  std::string systemFile =
-    globalMF->GetModulesFile("CMakeDetermineSystem.cmake");
-  if (!globalMF->ReadListFile(0, systemFile.c_str()))
-    {
-    cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
-      "Error reading CMakeDetermineSystem.cmake" << std::endl);
-    return 1;
-    }
-
-  systemFile =
-    globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake");
-  if (!globalMF->ReadListFile(0, systemFile.c_str()))
-    {
-    cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
-      "Error reading CMakeSystemSpecificInformation.cmake" << std::endl);
-    return 1;
-    }
 
   if ( parsed && !help )
     {
+    // find out which system cpack is running on, so it can setup the search
+    // paths, so FIND_XXX() commands can be used in scripts
+    std::string systemFile =
+      globalMF->GetModulesFile("CMakeDetermineSystem.cmake");
+    if (!globalMF->ReadListFile(0, systemFile.c_str()))
+      {
+      cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
+        "Error reading CMakeDetermineSystem.cmake" << std::endl);
+      return 1;
+      }
+
+    systemFile =
+      globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake");
+    if (!globalMF->ReadListFile(0, systemFile.c_str()))
+      {
+      cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
+        "Error reading CMakeSystemSpecificInformation.cmake" << std::endl);
+      return 1;
+      }
+
     if ( cmSystemTools::FileExists(cpackConfigFile.c_str()) )
       {
       cpackConfigFile =

-----------------------------------------------------------------------

Summary of changes:
 Source/CPack/cpack.cxx |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list