Re: [cmake-developers] target_compile_features remaining issues
On 04/20/2014 03:57 AM, Stephen Kelly wrote: Perhaps we can have a feature name like cxx_std_11 to require a given standard level with an error if it is not available. Which compilers would provide that feature? GCC 4.8.1 and Clang 3.4 (complete support)? GCC 4.7 (First release after ratification. Has compile flag -std=c++11)? GCC 4.3 (Has -std=c++0x)? MSVC? MSVC 2015 (speculative full support)? MSVC 2010 (partial support)? MSVC 2008 (Has override keyword)? Consider a project that writes set(CMAKE_CXX_STANDARD 11) and someone tries to build with a compiler for which CMake does not know about a -std=c++11 flag. Currently CMake generates no error and decays to build with no flag at all. Let's say the project happens to build without the flag because the compiler defaults to a hypothetical -std=ext11 flag. Furthermore the project code happens to (unintentionally) depend on that compiler's extensions to c++11 to compile. Everything appears to work. Later CMake learns about the -std=c++11 flag for that compiler and honors the CXX_STANDARD request by passing it. Now the compiler has its extensions disabled and the project fails to build. This was due to an update in CMake, not the project. We need a way for a project to say that it should not build unless CMake knows how to nominally enable support for the given language level. Within that level the project could do its own preprocessor tests or use WriteCompilerDetectionHeader to adapt to the subset of the language level the compiler actually supports. However, when CMake is asked to use a compiler it does not know supports the language level at all, it should be an error. -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/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] target_compile_features remaining issues
Brad King wrote:
Later CMake learns about the -std=c++11 flag for that compiler and
honors the CXX_STANDARD request by passing it. Now the compiler
has its extensions disabled and the project fails to build. This
was due to an update in CMake, not the project.
Is the same problem present with CMAKE_*_COMPILE_OPTIONS_{PIE,PIC,DLL} ?
We need a way for a project to say that it should not build unless
CMake knows how to nominally enable support for the given language
level.
This requirement is inconsistent with what people keep asking me for (namely
something like what the qmake CONFIG += c++11 does - enable a c++11 flag if
known, and do nothing if not), and is inconsistent with the decay- topic.
I think it be determined with code equivalent to
if (target-GetProperty(CXX_STANDARD == std::string(11)
!makefile-GetDefinition(CMAKE_CXX11_STANDARD_COMPILE_OPTION))
{
// FATAL_ERROR
}
We would need to know the compile options of compilers supported by existing
versions of CMake, and ensure that the option is recorded for new
CompilerIds and new releases of existing compiler ids too.
However, I guess two different interfaces are needed if you want to ensure
the 'require some notion of C++11' concept.
Thanks,
Steve.
--
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] Need help with dependency of generated header file
I'm trying to port a legacy project to using cmake. The header files
are needed by the sources.
The header files are generated so that the source file can compile.
The header files are regenerated if its dependency is changed. This
doesn't cause the source file to be rebuilt, even though it depends on
these header files.
I'm using cmake 2.8.10
SET(SRCS
foo.c
)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/foomsgId.h
${CMAKE_CURRENT_SOURCE_DIR}/foomsgDef.h
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND ${MSG_CONVERT}
ARGS foomessages.txt
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/foomessages.txt
)
ADD_CUSTOM_TARGET(
generate_foo_messages
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/foomsgId.h
${CMAKE_CURRENT_SOURCE_DIR}/foomsgDef.h
)
ADD_LIBRARY(foo SHARED ${SRCS})
SET_TARGET_PROPERTIES(foo PROPERTIES PREFIX SUFFIX .so OUTPUT_NAME foo)
ADD_DEPENDENCIES(foo generate_foo_messages)
--
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Custom Commands and Environmnt Settings for PATH and LD_LIBRARY_PATH
On 2014-04-11 05:32, Jörg Kreuzberger wrote:
[stuff about environment and custom commands]
So it would help to have a possiblity to have a custom command like this:
add_custom_command( OUTPUT out
COMMAND ..
COMMAND ..
ENVIRONMENT PATH=$ENV{PATH}
ENVIRONMENT LD_LIBRARY=
I'm pretty sure this is not the first time this sort of thing has come
up. It would indeed be useful to be able to pass environment values to a
custom command without having to roll your own wrapper script. However,
because the command must be run by the build too, I believe a wrapper of
some sort is unavoidable (though on POSIX platforms, 'env' can possibly
serve this purpose).
Bonus points for supporting '{PRE,AP}PEND ENVIRONMENT' which would
automatically use the platform-appropriate PATH separator to
prepend/append a specified value to an environment variable (omitting
the separator if the variable is empty).
However, to do this, I think you would need to teach CMake a new command
mode, e.g.:
cmake -E env VAR1=VALUE VAR2:=PREPEND_VALUE VAR3+=APPEND_VALUE \
command args
I think this would be a nice feature to have, though.
--
Matthew
--
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://www.cmake.org/mailman/listinfo/cmake
[CMake] INTERFACE_LINK_FLAGS ?
Is there a reason for the certain set of INTERFACE_* target properties we have? I have a situation where I'd like to add a /DELAYLOAD linker flag to any project that links against a certain library, but I get a message that INTERFACE_LINK_FLAGS is not supported. Do these INTERFACE_* properties need to be individually handled, or it is as simple as stripping the INTERFACE_ prefix and applying the properties to consumers? - Clint -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Custom Commands and Environmnt Settings for PATH and LD_LIBRARY_PATH
fyi... see also: https://github.com/Kitware/CMake/pull/31 http://public.kitware.com/Bug/view.php?id=5145 http://public.kitware.com/Bug/view.php?id=14306 http://public.kitware.com/Bug/view.php?id=10901 -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Resource filters in generated eclipse projects
On Friday, April 11, 2014 10:30:18 Josh Bialkowski wrote: Hello! Has anyone figured out a good way to preserve resource filters across a cmake-rerun when using an eclipse generated project? The eclipse re-indexing time on one of my projects has gotten a bit out of hand. By setting resource filters to have eclipse ignore the [Targets] and [Subprojects] virtual directories (and a project data directory) the re-indexing time is greatly reduced. However, whenever cmake is re-run and the project file is regenerated, the resource filters are lost. This happens quite frequently when changing branches in source control. Has anyone figured out a better way of preserving their resource filters across a cmake execution? can you please create enter a ticket at http://public.kitware.com/Bug/ ? Thanks Alex -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CTest CDash submission
Building the “Experimental” target creates a file named LastSubmit_20140421-2201.log.tmp which contains the following Upload files: 0 Build.xml 1 Configure.xml 2 Test.xml Using drop method: http Upload file: /Users/robertramey/WorkingProjects/safe_numerics/CMake/build-static/Testing/20140421-2201/Build.xml to Roberts-Mac-mini.local___Darwin-clang++___20140421-2201-Experimental___XML___Build.xml This suggests that it’s trying to submit the results to my own machine rather than the project at my.cdash/index.php Any help you can give me would be appreciated. Robert Ramey Robert Ramey Software Development (805)569-3793 ra...@rrsd.com www.rrsd.com -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] CTest CDash submission
I want to submit test results to a common area and I’m trying to get CTest / CDash to do it. So far after a couple of hours I’ve been unsuccessful. Here is information which shows more or less where I’m at. a) I created a dashboard at http://my.cdash.org/index.php?project=Safe+Numerics b) I have a CMakeLists text file which seems to work as it should. I builds a bunch of projects for my Mac Xcode IDE including build, test and run. This CMakeLists.txt file includes “include(CTest) c) I configure and generate the project and things seem to work great - until I build the project “Experimental” - 1) There is a new file in my directory named: LastSubmit_20140421-2126.log.tmp which contains: Upload files: 0 Build.xml 1 Configure.xml 2 Test.xml Using drop method: http Upload file: /Users/robertramey/WorkingProjects/safe_numerics/CMake/build-static/Testing/20140421-2126/Build.xml to Roberts-Mac-mini.local___Darwin-clang++___20140421-2126-Experimental___XML___Build.xml The contents of this file suggests that CTest is trying to load the results to my own machine rather than the CDash server. d) I also have a file at the same level as the CMakeLists.txt file named CTestConfig.cmake which contains: ## This file should be placed in the root directory of your project. ## Then modify the CMakeLists.txt file in the root directory of your ## project to incorporate the testing dashboard. ## # The following are required to uses Dart and the Cdash dashboard ## ENABLE_TESTING() ## INCLUDE(CTest) set(CTEST_PROJECT_NAME Safe Numerics) set(CTEST_NIGHTLY_START_TIME 01:00:00 UTC) set(CTEST_DROP_METHOD http) set(CTEST_DROP_SITE my.cdash.org) # set(CTEST_DROP_LOCATION /cdash/submit.php?project=MyProject) set(CTEST_DROP_LOCATION /index.php?project=Safe+Numerics) set(CTEST_DROP_SITE_CDASH TRUE) Which is what I believe I should have. Note that I also have a CMake generated file named DartConfiguration.tcl which contains (among other things) # Submission information IsCDash: TRUE CDashVersion: QueryCDashVersion: DropSite: my.cdash.org DropLocation: /index.php?project=Safe+Numerics DropSiteUser: DropSitePassword: DropSiteMode: DropMethod: http TriggerSite: ScpCommand: /usr/bin/scp # Dashboard start time NightlyStartTime: 01:00:00 UTC I don’t what role this plays, but it seems it has been setup consistently from the CTestConfig.cmake. Any help you can give me would be appreciated. Robert Ramey Robert Ramey Software Development (805)569-3793 ra...@rrsd.com www.rrsd.com -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CTest CDash submission
Actually this seems to almost work now. my test dashboard http://my.cdash.org/index.php?project=Safe+Numerics is showing one line with my machine configuration but zero tests. I’m getting an email from ad...@cdash.org that says Object: Cannot create handler based on XML content An XML submission from 68.6.127.66 to the project Safe Numerics cannot be parsed. The content of the file is as follow: Any help you can give me would be appreciated. Robert Ramey Robert Ramey Software Development (805)569-3793 ra...@rrsd.com www.rrsd.com -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CTest CDash submission
Actually this seems to be working now. I think after a couple of variations (I’m very stubborn!) it started to work without my realizing it. And I expected to see one line in the display per test. Only afterward, did I see that I have to click around the display to get all the information. Thanks for you help. Robert Ramey Robert Ramey Software Development (805)569-3793 ra...@rrsd.com www.rrsd.com -- 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://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2486-g75a5f65
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 75a5f65072c0b0a038c714eebf2d2d7a58e9ebed (commit)
via 2c96192f4c09bc9784ac7c483118a818cbf2701e (commit)
via e147c5c5558fbb1a6a704173a9a7c71848893ab0 (commit)
from 4ac46cbf929f392629d5a40d858815d8b0433687 (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=75a5f65072c0b0a038c714eebf2d2d7a58e9ebed
commit 75a5f65072c0b0a038c714eebf2d2d7a58e9ebed
Merge: 4ac46cb 2c96192
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Apr 21 09:24:27 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Apr 21 09:24:27 2014 -0400
Merge topic 'UseSWIG-guess_module_name' into next
2c96192f UseSWIG: Revise and format documentation
e147c5c5 UseSWIG: Detect module name from interface file (#10080)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c96192f4c09bc9784ac7c483118a818cbf2701e
commit 2c96192f4c09bc9784ac7c483118a818cbf2701e
Author: Julien Schueller schuel...@phimeca.com
AuthorDate: Thu Apr 3 08:28:10 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Apr 21 09:23:41 2014 -0400
UseSWIG: Revise and format documentation
Also add some documentation of SWIG_MODULE_NAME.
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index b694c40..060b44c 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -2,9 +2,7 @@
# UseSWIG
# ---
#
-# SWIG module for CMake
-#
-# Defines the following macros:
+# Defines the following macros for use with SWIG:
#
# ::
#
@@ -13,20 +11,38 @@
#SWIG_LINK_LIBRARIES(name [ libraries ])
# - Link libraries to swig module
#
-# All other macros are for internal use only. To get the actual name of
-# the swig module, use: ${SWIG_MODULE_${name}_REAL_NAME}. Set Source
-# files properties such as CPLUSPLUS and SWIG_FLAGS to specify special
-# behavior of SWIG. Also global CMAKE_SWIG_FLAGS can be used to add
-# special flags to all swig calls. Another special variable is
-# CMAKE_SWIG_OUTDIR, it allows one to specify where to write all the
-# swig generated module (swig -outdir option) The name-specific variable
-# SWIG_MODULE_name_EXTRA_DEPS may be used to specify extra
-# dependencies for the generated modules. If the source file generated
-# by swig need some special flag you can use::
+# Source files properties on module files can be set before the invocation
+# of the SWIG_ADD_MODULE macro to specify special behavior of SWIG.
#
-# set_source_files_properties( ${swig_generated_file_fullname}
-# PROPERTIES COMPILE_FLAGS -bla)
-
+# The source file property CPLUSPLUS calls SWIG in c++ mode, e.g.::
+#
+#set_property(SOURCE mymod.i PROPERTY CPLUSPLUS ON)
+#swig_add_module(mymod python mymod.i)
+#
+# The source file property SWIG_FLAGS adds custom flags to the SWIG executable.
+#
+# The source-file property SWIG_MODULE_NAME have to be provided to specify the
actual
+# import name of the module in the target language if it cannot be scanned
automatically
+# from source or different from the module file basename.::
+#
+#set_property(SOURCE mymod.i PROPERTY SWIG_MODULE_NAME mymod_realname)
+#
+# To get the name of the swig module target library, use:
${SWIG_MODULE_${name}_REAL_NAME}.
+#
+# Also some variables can be set to specify special behavior of SWIG.
+#
+# CMAKE_SWIG_FLAGS can be used to add special flags to all swig calls.
+#
+# Another special variable is CMAKE_SWIG_OUTDIR, it allows one to specify
+# where to write all the swig generated module (swig -outdir option)
+#
+# The name-specific variable SWIG_MODULE_name_EXTRA_DEPS may be used to
specify extra
+# dependencies for the generated modules.
+#
+# If the source file generated by swig need some special flag you can use::
+#
+#set_source_files_properties( ${swig_generated_file_fullname}
+# PROPERTIES COMPILE_FLAGS -bla)
#=
# Copyright 2004-2009 Kitware, Inc.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e147c5c5558fbb1a6a704173a9a7c71848893ab0
commit e147c5c5558fbb1a6a704173a9a7c71848893ab0
Author: Julien Schueller schuel...@phimeca.com
AuthorDate: Tue Apr 1 12:12:52 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Apr 21 09:22:57 2014 -0400
UseSWIG: Detect module name from interface file (#10080)
If no SWIG_MODULE_NAME is specified explicitly and the .i file exists,
scan it for the module name declaration.
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2488-g1bd675a
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 1bd675a83a4b7ec3df4f70ec8b36cee6e8c3409a (commit)
via d5a6069a12675d1fbea26aad8c37d53fcd5461e4 (commit)
from 75a5f65072c0b0a038c714eebf2d2d7a58e9ebed (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=1bd675a83a4b7ec3df4f70ec8b36cee6e8c3409a
commit 1bd675a83a4b7ec3df4f70ec8b36cee6e8c3409a
Merge: 75a5f65 d5a6069
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Apr 21 09:28:49 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Apr 21 09:28:49 2014 -0400
Merge topic 'FindGTK2_fix_bsd' into next
d5a6069a FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5a6069a12675d1fbea26aad8c37d53fcd5461e4
commit d5a6069a12675d1fbea26aad8c37d53fcd5461e4
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Apr 15 16:54:24 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Apr 21 09:28:55 2014 -0400
FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index fecf929..1bdad16 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -682,11 +682,15 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY(PANGOFT2 pangoft2 false true)
_GTK2_ADD_TARGET (PANGOFT2 GTK2_DEPENDS pango gobject glib
-OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+
${GTK2_FONTCONFIG_INCLUDE_DIR}
+
${GTK2_X11_INCLUDE_DIR})
_GTK2_FIND_LIBRARY(PANGOXFT pangoxft false true)
_GTK2_ADD_TARGET (PANGOXFT GTK2_DEPENDS pangoft2 pango gobject
glib
-OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+
${GTK2_FONTCONFIG_INCLUDE_DIR}
+
${GTK2_X11_INCLUDE_DIR})
_GTK2_FIND_INCLUDE_DIR(GDK gdk/gdk.h)
_GTK2_FIND_INCLUDE_DIR(GDKCONFIG gdkconfig.h)
@@ -717,8 +721,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_ADD_TARGET (GTK GTK2_DEPENDS gdk atk pangoft2 pango gdk_pixbuf
gthread gobject glib
GTK2_OPTIONAL_DEPENDS gio pangocairo cairo)
-# Left for compatibility with previous versions. It doesn't seem to be
required
+# Left for compatibility with previous versions.
_GTK2_FIND_INCLUDE_DIR(FONTCONFIG fontconfig/fontconfig.h)
+_GTK2_FIND_INCLUDE_DIR(X11 X11/Xlib.h)
elseif(_GTK2_component STREQUAL gtkmm)
@@ -745,29 +750,36 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(CAIROMMCONFIG cairommconfig.h)
_GTK2_FIND_LIBRARY(CAIROMM cairomm true true)
_GTK2_ADD_TARGET (CAIROMM GTK2_DEPENDS cairo sigc++
- OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+ OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+
${GTK2_FONTCONFIG_INCLUDE_DIR}
+
${GTK2_X11_INCLUDE_DIR})
_GTK2_FIND_INCLUDE_DIR(PANGOMM pangomm.h)
_GTK2_FIND_INCLUDE_DIR(PANGOMMCONFIG pangommconfig.h)
_GTK2_FIND_LIBRARY(PANGOMM pangomm true true)
_GTK2_ADD_TARGET (PANGOMM GTK2_DEPENDS glibmm sigc++ pango
gobject glib
GTK2_OPTIONAL_DEPENDS cairomm
pangocairo cairo
- OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
-
+ OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2}
+
${GTK2_FONTCONFIG_INCLUDE_DIR}
+
${GTK2_X11_INCLUDE_DIR})
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-704-g658cc11
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 658cc11cf19ed514f93afe3d837a0bd24377499d (commit) via cb59f5da97723f648df78fd16d95697008d5d42b (commit) from ba83d84714bff717b58ecb0c91df62ca91db3bb8 (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=658cc11cf19ed514f93afe3d837a0bd24377499d commit 658cc11cf19ed514f93afe3d837a0bd24377499d Merge: ba83d84 cb59f5d Author: Brad King brad.k...@kitware.com AuthorDate: Mon Apr 21 09:32:33 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Apr 21 09:32:33 2014 -0400 Merge topic 'fix-wix-cpack-crash' cb59f5da CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger --- Summary of changes: Source/CPack/WiX/cmCPackWIXGenerator.cxx | 19 ++- Source/CPack/WiX/cmCPackWIXGenerator.h |3 ++- 2 files changed, 16 insertions(+), 6 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. v3.0.0-rc4-693-gfd4ee2d
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 fd4ee2d86f4a2c5d1e3b4296aacec9b0f375dfc5 (commit) via d5a6069a12675d1fbea26aad8c37d53fcd5461e4 (commit) via ef9366b0bbb19639244a06ac34c8a8ecd35e66e8 (commit) from ad8041e3359d9bf10d674870e0455a26b6b5244b (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=fd4ee2d86f4a2c5d1e3b4296aacec9b0f375dfc5 commit fd4ee2d86f4a2c5d1e3b4296aacec9b0f375dfc5 Merge: ad8041e d5a6069 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Apr 21 09:32:25 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Apr 21 09:32:25 2014 -0400 Merge topic 'FindGTK2_fix_bsd' d5a6069a FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes ef9366b0 FindGTK2: Add /usr/X11R6/ to include paths --- Summary of changes: Modules/FindGTK2.cmake | 38 -- 1 file changed, 28 insertions(+), 10 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. v3.0.0-rc4-700-ga097253
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 a0972532b3d6bc31ac3cbf432cd0566e5d4b8f31 (commit) via 692228e41821a1af1f904304984c7366ae2ca288 (commit) via e5e9b8e9a33186c0684974a54507d07596d72a1b (commit) from bb891c2ef1d5f2cf95fff64fe183a8f6d512d6ea (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=a0972532b3d6bc31ac3cbf432cd0566e5d4b8f31 commit a0972532b3d6bc31ac3cbf432cd0566e5d4b8f31 Merge: bb891c2 692228e Author: Brad King brad.k...@kitware.com AuthorDate: Mon Apr 21 09:32:30 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Apr 21 09:32:30 2014 -0400 Merge topic 'CMP0052-docs' 692228e4 Help: Link to cmake-buildsystem from CMP0052 docs. e5e9b8e9 Help: Add code example for INSTALL_INTERFACE to cmake-buildsystem. --- Summary of changes: Help/manual/cmake-buildsystem.7.rst | 12 +++- Help/policy/CMP0052.rst |3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) 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. v3.0.0-rc4-697-gbb891c2
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 bb891c2ef1d5f2cf95fff64fe183a8f6d512d6ea (commit) via 3de4c2956539a4251b65b88bff477d5866e98510 (commit) from 464c8ab3a27fdf323a2607ee9389a79466648643 (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=bb891c2ef1d5f2cf95fff64fe183a8f6d512d6ea commit bb891c2ef1d5f2cf95fff64fe183a8f6d512d6ea Merge: 464c8ab 3de4c29 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Apr 21 09:32:28 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Apr 21 09:32:28 2014 -0400 Merge topic 'internal-error-backtrace' 3de4c295 cmake: Print C++ stack trace after INTERNAL_ERROR messages --- Summary of changes: Source/cmake.cxx | 17 + 1 file changed, 17 insertions(+) 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. v3.0.0-rc4-695-g464c8ab
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 464c8ab3a27fdf323a2607ee9389a79466648643 (commit) via 33774ca2018666138e5d31dde457643357f33815 (commit) from fd4ee2d86f4a2c5d1e3b4296aacec9b0f375dfc5 (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=464c8ab3a27fdf323a2607ee9389a79466648643 commit 464c8ab3a27fdf323a2607ee9389a79466648643 Merge: fd4ee2d 33774ca Author: Brad King brad.k...@kitware.com AuthorDate: Mon Apr 21 09:32:27 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Apr 21 09:32:27 2014 -0400 Merge topic 'autorcc-target-dir' 33774ca2 QtAutogen: Put generated qrc files in a target-specific dir. --- Summary of changes: Modules/AutogenInfo.cmake.in |1 + Source/cmQtAutoGenerators.cxx | 12 ++-- Source/cmQtAutoGenerators.h |1 + 3 files changed, 12 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, master, updated. v3.0.0-rc4-702-gba83d84
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 ba83d84714bff717b58ecb0c91df62ca91db3bb8 (commit) via ccd29b9af849316a9361ceb8d0addb24e7158382 (commit) from a0972532b3d6bc31ac3cbf432cd0566e5d4b8f31 (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=ba83d84714bff717b58ecb0c91df62ca91db3bb8 commit ba83d84714bff717b58ecb0c91df62ca91db3bb8 Merge: a097253 ccd29b9 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Apr 21 09:32:32 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Apr 21 09:32:32 2014 -0400 Merge topic 'ExternalData-missing-not-fatal' ccd29b9a ExternalData: Warn on missing file instead of failing --- Summary of changes: Modules/ExternalData.cmake | 44 +--- Tests/Module/ExternalData/CMakeLists.txt |2 + Tests/Module/ExternalData/Data1Check.cmake | 22 ++ Tests/RunCMake/ExternalData/Directory1-stderr.txt |2 +- Tests/RunCMake/ExternalData/Directory3-result.txt |1 - Tests/RunCMake/ExternalData/Directory3-stderr.txt |3 +- Tests/RunCMake/ExternalData/MissingData-result.txt |1 - Tests/RunCMake/ExternalData/MissingData-stderr.txt |5 ++- Tests/RunCMake/ExternalData/MissingData-stdout.txt |1 + Tests/RunCMake/ExternalData/MissingData.cmake | 13 -- .../MissingDataWithAssociated-stderr.txt | 15 +++ .../MissingDataWithAssociated-stdout.txt |1 + .../ExternalData/MissingDataWithAssociated.cmake | 10 + Tests/RunCMake/ExternalData/RunCMakeTest.cmake |1 + 14 files changed, 96 insertions(+), 25 deletions(-) delete mode 100644 Tests/RunCMake/ExternalData/Directory3-result.txt delete mode 100644 Tests/RunCMake/ExternalData/MissingData-result.txt create mode 100644 Tests/RunCMake/ExternalData/MissingData-stdout.txt create mode 100644 Tests/RunCMake/ExternalData/MissingDataWithAssociated-stderr.txt create mode 100644 Tests/RunCMake/ExternalData/MissingDataWithAssociated-stdout.txt create mode 100644 Tests/RunCMake/ExternalData/MissingDataWithAssociated.cmake 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. v3.0.0-rc4-2499-g3171c9a
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 3171c9af19e486e76d01bf7b236e35a76eb8db35 (commit) via 658cc11cf19ed514f93afe3d837a0bd24377499d (commit) via ba83d84714bff717b58ecb0c91df62ca91db3bb8 (commit) via a0972532b3d6bc31ac3cbf432cd0566e5d4b8f31 (commit) via bb891c2ef1d5f2cf95fff64fe183a8f6d512d6ea (commit) via 464c8ab3a27fdf323a2607ee9389a79466648643 (commit) via fd4ee2d86f4a2c5d1e3b4296aacec9b0f375dfc5 (commit) via ad8041e3359d9bf10d674870e0455a26b6b5244b (commit) via c770d404d23e9530341c791f37697ee5bc70838c (commit) via bae94522008d4b18c2afa171d3498461c8289d3b (commit) via 1a4eb509468ce8e8766f6e0dab2565c66168e56b (commit) from 1bd675a83a4b7ec3df4f70ec8b36cee6e8c3409a (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=3171c9af19e486e76d01bf7b236e35a76eb8db35 commit 3171c9af19e486e76d01bf7b236e35a76eb8db35 Merge: 1bd675a 658cc11 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Apr 21 09:33:48 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Apr 21 09:33:48 2014 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. v3.0.0-rc4-2501-g31a0427
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 31a042769fb0b809841e76987cb8eb9ddaeb0eae (commit) via b10083876ce01f6f9181688619136edd9daf26be (commit) from 3171c9af19e486e76d01bf7b236e35a76eb8db35 (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=31a042769fb0b809841e76987cb8eb9ddaeb0eae commit 31a042769fb0b809841e76987cb8eb9ddaeb0eae Merge: 3171c9a b100838 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Apr 21 09:36:50 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Apr 21 09:36:50 2014 -0400 Merge branch 'master' into next --- Summary of changes: 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. v3.0.0-rc4-708-gb100838
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 b10083876ce01f6f9181688619136edd9daf26be (commit)
via 8d0b1ccac13389255a318422d38b246cf47d9ace (commit)
via 447fbb3facd09a29a2a402df258acf01cbf0bc34 (commit)
via 597bb72ed7a74bf9b70dec8726113050e731d667 (commit)
from 658cc11cf19ed514f93afe3d837a0bd24377499d (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=b10083876ce01f6f9181688619136edd9daf26be
commit b10083876ce01f6f9181688619136edd9daf26be
Merge: 658cc11 8d0b1cc
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Apr 21 09:35:42 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Apr 21 09:35:42 2014 -0400
Merge topic 'feature-absence-hard-error'
8d0b1cca Features: FATAL_ERROR on compilers with no recorded features.
447fbb3f Tests: Execute compile features tests unconditionally.
597bb72e Tests: Run RunCMake.target_compile_features unconditionally.
---
Summary of changes:
Source/cmMakefile.cxx | 24 ++--
.../target_compile_features/CMakeLists.txt |8 +++
Tests/CMakeLists.txt |8 +++
Tests/CompileFeatures/CMakeLists.txt |8 +++
Tests/RunCMake/CMakeLists.txt |4 +---
.../NoSupportedCxxFeatures-result.txt} |0
.../NoSupportedCxxFeatures-stderr.txt |8 +++
.../CompileFeatures/NoSupportedCxxFeatures.cmake |3 +++
.../NoSupportedCxxFeaturesGenex-result.txt}|0
.../NoSupportedCxxFeaturesGenex-stderr.txt |6 +
.../NoSupportedCxxFeaturesGenex.cmake |3 +++
Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 11 +
.../CompileFeatures/generate_feature_list.cmake|4
13 files changed, 77 insertions(+), 10 deletions(-)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
CompileFeatures/NoSupportedCxxFeatures-result.txt} (100%)
create mode 100644
Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt
create mode 100644 Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
CompileFeatures/NoSupportedCxxFeaturesGenex-result.txt} (100%)
create mode 100644
Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt
create mode 100644
Tests/RunCMake/CompileFeatures/NoSupportedCxxFeaturesGenex.cmake
create mode 100644 Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
