date:20120620

[cmake-developers] target_automoc targets in VS2010 projects

2012-06-20 Thread Thomas Sondergaard

Is it possible to hide the target_automoc targets when using the 
VS2010 generator? If it is not possible, it would be very useful if they 
could be put in a folder, ie


set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(GLOBAL PROPERTY AUTOMOC_FOLDER automoc)

We tried putting the generated target_automoc targets in VS2010 
folders manually like shown below, but it doesn't work.


set_property(GLOBAL PROPERTY USE_FOLDERS ON)

add_executable(my-target )
set_target_properties(my-target PROPERTIES AUTOMOC TRUE)
set_property(TARGET my-target_automoc PROPERTY FOLDER automoc)

Best regards,

Thomas

--

Powered by www.kitware.com

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

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

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

[cmake-developers] Improvements to Qt4 macros

2012-06-20 Thread Rolf Eike Beer

Hi,

while wrestling with QtDBus today I found out the hard way (i.e. reading the 
source) that QT4_ADD_DBUS_INTERFACE is much more powerful than its 
documentation tells. To fix that the first patch now tells about the 
properties you may set on the input file. While at it I also added a reference 
from QT4_AUTOMOC macro to the new AUTOMOC property.

The other 2 patches improve some things I found while reading the source code.

Patch #2 uses get_filename_component to strip the path from the given input 
file (why implement something again that we already have?). It also applies 
string(TOLOWER) earlier so that an XML file with an upper or mixed case 
extension (FAT anyone?) will also be properly handled.

Patch #3 finally wraps a lot of set(...) in quotes when the argument may 
contain spaces, e.g. CMAKE_CURRENT_BINARY_DIR. It also uses LIST(APPEND) to 
add to the list of source files instead of just using set(). Together with 
additional quotes this should make things much less likely to screw up things.

If noone objects I'll merge this to next tonight. Running the testsuite 
locally did not show any errors.

EikeFrom af7f8bd6bb23ef2e68fe53b16baae3f84f25b48d Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer e...@sf-mail.de
Date: Wed, 20 Jun 2012 13:11:40 +0200
Subject: [PATCH 1/3] FindQt4: extend documentation

-refer to AUTOMOC from QT4_AUTOMOC
-mention how source file properties influence QT4_ADD_DBUS_INTERFACE
---
 Modules/FindQt4.cmake |   25 +++--
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 391797e..2f1708d 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -102,15 +102,28 @@
 #accompanying header file foo.h.
 #If a source file has the SKIP_AUTOMOC property set it will be ignored by this macro.
 #
+#You should have a look on the AUTOMOC property for targets to achieve the same results.
+#
 #  macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename)
-#create a the interface header and implementation files with the 
+#Create a the interface header and implementation files with the
 #given basename from the given interface xml file and add it to 
-#the list of sources
+#the list of sources.
+#
+#You can pass additional parameters to the qdbusxml2cpp call by setting
+#properties on the input file:
+#
+#INCLUDE the given file will be included in the generate interface header
+#
+#CLASSNAME the generated class is named accordingly
+#
+#NO_NAMESPACE the generated class is not wrapped in a namespace
 #
 #  macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... )
-#create the interface header and implementation files 
-#for all listed interface xml files
-#the name will be automatically determined from the name of the xml file
+#Create the interface header and implementation files
+#for all listed interface xml files.
+#The basename will be automatically determined from the name of the xml file.
+#
+#The source file properties described for QT4_ADD_DBUS_INTERFACE also apply here.
 #
 #  macro QT4_ADD_DBUS_ADAPTOR(outfiles xmlfile parentheader parentclassname [basename] [classname])
 #create a dbus adaptor (header and implementation file) from the xml file
@@ -217,7 +230,7 @@
 #  QT_QAXCONTAINER_INCLUDE_DIR Path to include/ActiveQt (Windows only)
 #  QT_QAXSERVER_INCLUDE_DIRPath to include/ActiveQt (Windows only)
 #  QT_QTCORE_INCLUDE_DIR   Path to include/QtCore 
-#  QT_QTDBUS_INCLUDE_DIR   Path to include/QtDBus 
+#  QT_QTDBUS_INCLUDE_DIR   Path to include/QtDBus
 #  QT_QTDESIGNER_INCLUDE_DIR   Path to include/QtDesigner 
 #  QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR   Path to include/QtDesigner
 #  QT_QTGUI_INCLUDE_DIRPath to include/QtGui 
-- 
1.7.7.3

From 8929188877596d745e9cec4eec7ae337a5d8e3ca Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer e...@sf-mail.de
Date: Wed, 20 Jun 2012 13:23:40 +0200
Subject: [PATCH 2/3] Qt4Macros: improve basename extraction in
 QT4_ADD_DBUS_INTERFACES

-convert the filename to lowercase before the extraction, this allows this to
 work even if the filename as uppercase .XML extension
-use get_filename_component(... NAME) to strip the path
---
 Modules/Qt4Macros.cmake |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index f867bc5..7170711 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -258,9 +258,10 @@ ENDMACRO(QT4_ADD_DBUS_INTERFACE)
 MACRO(QT4_ADD_DBUS_INTERFACES _sources)
   FOREACH (_current_FILE ${ARGN})
 GET_FILENAME_COMPONENT(_infile ${_current_FILE} ABSOLUTE)
+GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME)
 # get the part before the .xml suffix
-STRING(REGEX REPLACE (.*[/\\.])?([^\\.]+)\\.xml \\2 _basename ${_current_FILE})
 STRING(TOLOWER

[cmake-developers] [CMake 0013323]: CMake crashes if language is set inproperly.

2012-06-20 Thread Mantis Bug Tracker


The following issue has been SUBMITTED. 
== 
http://public.kitware.com/Bug/view.php?id=13323 
== 
Reported By:Mariusz Plucinski
Assigned To:
== 
Project:CMake
Issue ID:   13323
Category:   CMake
Reproducibility:always
Severity:   minor
Priority:   normal
Status: new
== 
Date Submitted: 2012-06-20 08:02 EDT
Last Modified:  2012-06-20 08:02 EDT
== 
Summary:CMake crashes if language is set inproperly.
Description: 
Found it during experimenting with adding new language support. CMake crashes
when there is a problem with source file language property.

Steps to Reproduce: 
1. Create CMakeLists.txt and put the following code:

project(BugTest)
cmake_minimum_required(VERSION 2.8)
add_executable(Foo Bar.asd)
set_target_properties(Foo PROPERTIES LINKER_LANGUAGE asd)

2. Create empty Bar.asd file
3. Run cmake . under Windows, using Visual Studio 10 generator.

Additional Information: 
Expected result:

Getting an error message about missing variable: CMAKE_asd_LINK_EXECUTABLE

Actual result:

Application crash (Access violation).

Attached patch fixes an error.
== 

Issue History 
Date ModifiedUsername   FieldChange   
== 
2012-06-20 08:02 Mariusz PlucinskiNew Issue
2012-06-20 08:02 Mariusz PlucinskiFile Added: cmake_cmLocalGenerator.patch  
 
==

--

Powered by www.kitware.com

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

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

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

Re: [cmake-developers] Improvements to Qt4 macros

2012-06-20 Thread Clinton Stimpson

On Jun 20, 2012, at 5:51 AM, Rolf Eike Beer wrote:

Hi,

while wrestling with QtDBus today I found out the hard way (i.e. reading the
source) that QT4_ADD_DBUS_INTERFACE is much more powerful than its
documentation tells. To fix that the first patch now tells about the
properties you may set on the input file. While at it I also added a
reference
from QT4_AUTOMOC macro to the new AUTOMOC property.

The other 2 patches improve some things I found while reading the source code.

Patch #2 uses get_filename_component to strip the path from the given input
file (why implement something again that we already have?). It also applies
string(TOLOWER) earlier so that an XML file with an upper or mixed case
extension (FAT anyone?) will also be properly handled.

Patch #3 finally wraps a lot of set(...) in quotes when the argument may
contain spaces, e.g. CMAKE_CURRENT_BINARY_DIR. It also uses LIST(APPEND) to
add to the list of source files instead of just using set(). Together with
additional quotes this should make things much less likely to screw up things.

If noone objects I'll merge this to next tonight. Running the testsuite
locally did not show any errors.

Eike0001-FindQt4-extend-documentation.patch0002-Qt4Macros-improve-basename-extraction-in-QT4_ADD_DBU.patch0003-Qt4Macros-add-some-quotes-to-prevent-damage-from-spa.patch

I don't think the test suite covers QtDbus. Perhaps that can be added?
What about a case sensitive file system with .XML instead of .xml? Does your
second patch break that?
Other than that question, I have no objections.

52 matches

Mail list logo