date:20140316

[cmake-developers] FindPkgConfig_Extend-PKG_CONFIG_PATH

2014-03-16 Thread Christoph Grüninger

Hi Daniele, hi Brad,
thanks for you recent work on FindPkgConfig. I just wanted to
investigation the feature myself and found out you already did all the
work. Maybe you missed it, your patch fixes backlogged #12926. Great!

I'd like to add additional paths for pkg_check_modules similar to
find_program:
   [PATHS path1 [path2 ... ENV var]]
Daniele would you mind to add such a feature? Or are there any
objections if I do it myself?

Bye
Christoph, loving open-source software a little bit more

-- 
"Mr. Jones, are we ready to release our new software?"
"Yes, sir. As requested, it's full of bugs, which means people
 will be forced to upgrade for years."
"Outstanding."[from James Bond - Tomorrow never dies]
-- 

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/cgi-bin/mailman/listinfo/cmake-developers

[cmake-developers] [PATCH] Enable Wmake generator on Linux host

2014-03-16 Thread Jiri Malak

I enclosed patch, which enable generation of wmake makefiles on Linux host.

Regards

Jiri>From 7e3d5e03fe82ad48e404140314b6c1d81ad124ef Mon Sep 17 00:00:00 2001
From: Jiri Malak 
Date: Sun, 16 Mar 2014 12:36:09 +0100
Subject: [PATCH 2/2] Enable WMake generator on Linux

---
 Source/CMakeLists.txt   |  9 -
 Source/cmGlobalWatcomWMakeGenerator.cxx |  4 
 Source/cmake.cxx| 10 +++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 966e0f6..dafb0d4 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -399,7 +399,6 @@ if (WIN32)
   cmGlobalVisualStudio12Generator.cxx
   cmGlobalVisualStudioGenerator.cxx
   cmGlobalVisualStudioGenerator.h
-  cmGlobalWatcomWMakeGenerator.cxx
   cmIDEFlagTable.h
   cmIDEOptions.cxx
   cmIDEOptions.h
@@ -419,6 +418,14 @@ if (WIN32)
   endif()
 endif ()
 
+# Watcom support
+if(WIN32 OR UNIX AND NOT APPLE)
+  set(SRCS ${SRCS}
+cmGlobalWatcomWMakeGenerator.cxx
+cmGlobalWatcomWMakeGenerator.h
+)
+endif()
+
 # Ninja support
 set(SRCS ${SRCS}
   cmGlobalNinjaGenerator.cxx
diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx
index 671166e..f2105f8 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.cxx
+++ b/Source/cmGlobalWatcomWMakeGenerator.cxx
@@ -16,7 +16,9 @@
 cmGlobalWatcomWMakeGenerator::cmGlobalWatcomWMakeGenerator()
 {
   this->FindMakeProgramFile = "CMakeFindWMake.cmake";
+#ifdef _WIN32  
   this->ForceUnixPaths = false;
+#endif
   this->ToolSupportsColor = true;
   this->NeedSymbolicMark = true;
   this->EmptyRuleHackCommand = "@cd .";
@@ -44,7 +46,9 @@ cmLocalGenerator *cmGlobalWatcomWMakeGenerator::CreateLocalGenerator()
 {
   cmLocalUnixMakefileGenerator3* lg = new cmLocalUnixMakefileGenerator3;
   lg->SetDefineWindowsNULL(true);
+#ifdef _WIN32  
   lg->SetWindowsShell(true);
+#endif
   lg->SetWatcomWMake(true);
   lg->SetMakeSilentFlag("-h");
   lg->SetGlobalGenerator(this);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 4ce1d70..b1c64cf 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -60,13 +60,15 @@
 #include "cmGlobalBorlandMakefileGenerator.h"
 #include "cmGlobalNMakeMakefileGenerator.h"
 #include "cmGlobalJOMMakefileGenerator.h"
-#include "cmGlobalWatcomWMakeGenerator.h"
 #define CMAKE_HAVE_VS_GENERATORS
 #  endif
 #  include "cmGlobalMSYSMakefileGenerator.h"
 #  include "cmGlobalMinGWMakefileGenerator.h"
 #else
 #endif
+#if defined(_WIN32) || defined(__linux__)
+#include "cmGlobalWatcomWMakeGenerator.h"
+#endif
 #include "cmGlobalUnixMakefileGenerator3.h"
 #include "cmGlobalNinjaGenerator.h"
 #include "cmExtraCodeLiteGenerator.h"
@@ -1781,8 +1783,6 @@ void cmake::AddDefaultGenerators()
 cmGlobalNMakeMakefileGenerator::NewFactory());
   this->Generators.push_back(
 cmGlobalJOMMakefileGenerator::NewFactory());
-  this->Generators.push_back(
-cmGlobalWatcomWMakeGenerator::NewFactory());
 # endif
   this->Generators.push_back(
 cmGlobalMSYSMakefileGenerator::NewFactory());
@@ -1793,6 +1793,10 @@ void cmake::AddDefaultGenerators()
 cmGlobalUnixMakefileGenerator3::NewFactory());
   this->Generators.push_back(
 cmGlobalNinjaGenerator::NewFactory());
+#if defined(_WIN32) || defined(__linux__)
+  this->Generators.push_back(
+cmGlobalWatcomWMakeGenerator::NewFactory());
+#endif
 #ifdef CMAKE_USE_XCODE
   this->Generators.push_back(
 cmGlobalXCodeGenerator::NewFactory());
-- 
1.8.1.4
-- 

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/cgi-bin/mailman/listinfo/cmake-developers

[cmake-developers] [PATCH] add one blank line to output Wmake makefile for better readability

2014-03-16 Thread Jiri Malak

I enclosed patch for cosmetic change of output Wmake makefiles.

Jiri>From 2378bb8236317b610963c28af5d9bc41650f4042 Mon Sep 17 00:00:00 2001
From: Jiri Malak 
Date: Sun, 16 Mar 2014 12:35:18 +0100
Subject: [PATCH 1/2] add one blank line to makefile for better readability

---
 Source/cmLocalUnixMakefileGenerator3.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 9f12ffe..2a54d4b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -781,6 +781,7 @@ cmLocalUnixMakefileGenerator3
   "!ifndef VERBOSE\n"
   ".SILENT\n"
   "!endif\n"
+  "\n"
   ;
 }
   else
-- 
1.8.1.4
-- 

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/cgi-bin/mailman/listinfo/cmake-developers

[cmake-developers] FindPkgConfig_Extend-PKG_CONFIG_PATH

[cmake-developers] [PATCH] Enable Wmake generator on Linux host

[cmake-developers] [PATCH] add one blank line to output Wmake makefile for better readability

3 matches

Site Navigation

Mail list logo

Footer information