[cmake-developers] [PATCH] updated a couple of hidden includes made to support CMake's dependency scanning

2016-02-08 Thread Costy Petrisor
Hello,

I don't know if this patch helps or not, I am not a CMake contributor, but
while checking the code for how a feature is implemented, I found that a
few hidden includes (to support CMake's dependency scanning) were not up to
date.

I did not found a mailing list for kwsys, so I emailed this one instead.

I built this patch in CMake's copy of kwsys, not the standalone kwsys repo.


Hope it helps,
Costy

---

>From 556ee6b4fe653925d5d71e64194002958368d64b Mon Sep 17 00:00:00 2001
From: Costy Petrisor 
Date: Mon, 8 Feb 2016 11:27:53 +
Subject: [PATCH] updated a couple of hidden includes made to support CMake's
 dependency scanning

---
 CommandLineArguments.cxx | 1 +
 ProcessWin32.c   | 2 +-
 SystemInformation.cxx| 1 -
 SystemTools.cxx  | 1 +
 testHashSTL.cxx  | 1 -
 testIOS.cxx  | 6 ++
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CommandLineArguments.cxx b/CommandLineArguments.cxx
index 3636836..f713294 100644
--- a/CommandLineArguments.cxx
+++ b/CommandLineArguments.cxx
@@ -20,6 +20,7 @@
 #if 0
 # include "CommandLineArguments.hxx.in"
 # include "Configure.hxx.in"
+# include "String.hxx.in"
 #endif

 #include 
diff --git a/ProcessWin32.c b/ProcessWin32.c
index 1f8749f..eabd85f 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -17,7 +17,7 @@
duplicate the above list of headers.  */
 #if 0
 # include "Process.h.in"
-# include "Encoding_c.h.in"
+# include "Encoding.h.in"
 #endif

 /*
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index cddcc8d..a33bb6f 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -43,7 +43,6 @@
 #if 0
 # include "SystemInformation.hxx.in"
 # include "Process.h.in"
-# include "Configure.hxx.in"
 #endif

 #include 
diff --git a/SystemTools.cxx b/SystemTools.cxx
index e3428f8..3d8c79a 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -39,6 +39,7 @@
 // Work-around CMake dependency scanning limitation.  This must
 // duplicate the above list of headers.
 #if 0
+# include "RegularExpression.hxx.in"
 # include "SystemTools.hxx.in"
 # include "Directory.hxx.in"
 # include "FStream.hxx.in"
diff --git a/testHashSTL.cxx b/testHashSTL.cxx
index ab1f83e..ae66ceb 100644
--- a/testHashSTL.cxx
+++ b/testHashSTL.cxx
@@ -18,7 +18,6 @@
 #if 0
 # include "hash_map.hxx.in"
 # include "hash_set.hxx.in"
-# include "hashtable.hxx.in"
 #endif

 #include 
diff --git a/testIOS.cxx b/testIOS.cxx
index 396a09d..5ff7955 100644
--- a/testIOS.cxx
+++ b/testIOS.cxx
@@ -18,6 +18,12 @@
 #include 
 #include  /* strlen */

+// Work-around CMake dependency scanning limitation.  This must
+// duplicate the above list of headers.
+#if 0
+# include "Configure.hxx.in"
+#endif
+
 int testIOS(int, char*[])
 {
   std::ostringstream ostr;
-- 
2.7.0.windows.1
-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] [PATCH] updated a couple of hidden includes made to support CMake's dependency scanning

2016-02-08 Thread Brad King
On 02/08/2016 06:39 AM, Costy Petrisor wrote:
> I did not found a mailing list for kwsys, so I emailed this one instead.

That's fine, thanks.  I applied it for testing in upstream KWSys here:

 http://review.source.kitware.com/20765

After integration there it will be updated in CMake.

Thanks!
-Brad

-- 

Powered by www.kitware.com

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers