[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1231-g4668f9e
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 4668f9ed6842fee90007c6134710c0c2d9aa787d (commit)
via 5f933bd6620e6abf54268087d6714691cec57194 (commit)
from 7b24b3bb11baee969d6a8942f08c8f6fbe108f35 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4668f9ed6842fee90007c6134710c0c2d9aa787d
commit 4668f9ed6842fee90007c6134710c0c2d9aa787d
Merge: 7b24b3b 5f933bd
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Tue Nov 3 05:04:13 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 3 05:04:13 2015 -0500
Merge topic 'FindGTK2_GTK2_TARGETS' into next
5f933bd6 FindGTK2: Use targets in GTK2_LIBRARIES if
GTK2_USE_IMPORTED_TARGETS is ON
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f933bd6620e6abf54268087d6714691cec57194
commit 5f933bd6620e6abf54268087d6714691cec57194
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Fri Oct 30 12:33:53 2015 +0100
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Mon Nov 2 12:38:19 2015 +0100
FindGTK2: Use targets in GTK2_LIBRARIES if GTK2_USE_IMPORTED_TARGETS is ON
Also add GTK2_TARGETS variable containing all imported targets.
Previously, the GTK2_LIBRARIES variable was filled with the paths to the
libraries, and only the GTK2_XXX_LIBRARY variables contained the imported
targets.
diff --git a/Help/release/dev/FindGTK2_GTK2_TARGETS.rst
b/Help/release/dev/FindGTK2_GTK2_TARGETS.rst
new file mode 100644
index 000..216e2e8
--- /dev/null
+++ b/Help/release/dev/FindGTK2_GTK2_TARGETS.rst
@@ -0,0 +1,7 @@
+FindGTK2_GTK2_TARGETS
+-
+
+* The `GTK2_LIBRARIES` variable created by the :module:`FindGTK2` module
+ now contains the targets instead of the paths to the libraries if
+ `GTK2_USE_IMPORTED_TARGETS` is enabled. Moreover it adds a new
+ `GTK2_TARGETS` variable containing all the targets imported.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index ab4ef3e..6e4a7f2 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -34,6 +34,7 @@
#GTK2_FOUND - Were all of your specified components found?
#GTK2_INCLUDE_DIRS - All include directories
#GTK2_LIBRARIES - All libraries
+#GTK2_TARGETS - All imported targets
#GTK2_DEFINITIONS - Additional compiler flags
#
#
@@ -550,6 +551,9 @@ function(_GTK2_ADD_TARGET _var)
add_library(GTK2::${_basename} UNKNOWN IMPORTED)
+set(GTK2_TARGETS ${GTK2_TARGETS} GTK2::${_basename})
+set(GTK2_TARGETS ${GTK2_TARGETS} PARENT_SCOPE)
+
if(GTK2_${_var}_LIBRARY_RELEASE)
set_property(TARGET GTK2::${_basename} APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
set_property(TARGET GTK2::${_basename}PROPERTY
IMPORTED_LOCATION_RELEASE "${GTK2_${_var}_LIBRARY_RELEASE}" )
@@ -602,6 +606,7 @@ endfunction()
set(GTK2_FOUND)
set(GTK2_INCLUDE_DIRS)
set(GTK2_LIBRARIES)
+set(GTK2_TARGETS)
set(GTK2_DEFINITIONS)
if(NOT GTK2_FIND_COMPONENTS)
@@ -940,6 +945,11 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
endif()
endforeach()
+if(GTK2_USE_IMPORTED_TARGETS)
+set(GTK2_LIBRARIES ${GTK2_TARGETS})
+endif()
+
+
if(_GTK2_did_we_find_everything AND NOT GTK2_VERSION_CHECK_FAILED)
set(GTK2_FOUND true)
else()
@@ -951,6 +961,7 @@ else()
set(GTK2_VERSION_PATCH)
set(GTK2_INCLUDE_DIRS)
set(GTK2_LIBRARIES)
+set(GTK2_TARGETS)
set(GTK2_DEFINITIONS)
endif()
---
Summary of changes:
Help/release/dev/FindGTK2_GTK2_TARGETS.rst |7 +++
Modules/FindGTK2.cmake | 11 +++
2 files changed, 18 insertions(+)
create mode 100644 Help/release/dev/FindGTK2_GTK2_TARGETS.rst
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-191-g6d0145d
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 6d0145dbeace6b7be1073796cf95154764378114 (commit)
via 8036c7f0d40a45614937f386636d0a227d9de7dd (commit)
from 5f678ee258419a1f50bc5d88e04ca14a4a2b7d91 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d0145dbeace6b7be1073796cf95154764378114
commit 6d0145dbeace6b7be1073796cf95154764378114
Merge: 5f678ee 8036c7f
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Thu Oct 8 10:20:28 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Oct 8 10:20:28 2015 -0400
Merge topic 'FindGTK2_sigc++_c++11' into next
8036c7f0 FindGTK2: Do not perform sigc++ version check if config file was
not found
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8036c7f0d40a45614937f386636d0a227d9de7dd
commit 8036c7f0d40a45614937f386636d0a227d9de7dd
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Thu Oct 8 16:19:58 2015 +0200
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Thu Oct 8 16:19:58 2015 +0200
FindGTK2: Do not perform sigc++ version check if config file was not found
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 501055b..ab4ef3e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -772,23 +772,25 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY(SIGC++ sigc true true)
_GTK2_ADD_TARGET (SIGC++)
# Since sigc++ 2.5.1 c++11 support is required
-_GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
- GTK2_SIGC++_VERSION_MINOR
- GTK2_SIGC++_VERSION_MICRO
-
${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
-if(NOT
${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO}
VERSION_LESS 2.5.1)
-# These are the features needed by clients in order to include the
-# project headers:
-set_property(TARGET GTK2::sigc++
- PROPERTY INTERFACE_COMPILE_FEATURES
cxx_alias_templates
- cxx_auto_type
- cxx_decltype
-
cxx_deleted_functions
- cxx_noexcept
- cxx_nullptr
-
cxx_right_angle_brackets
-
cxx_rvalue_references
-
cxx_variadic_templates)
+if(GTK2_SIGC++CONFIG_INCLUDE_DIR)
+_GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
+ GTK2_SIGC++_VERSION_MINOR
+ GTK2_SIGC++_VERSION_MICRO
+
${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
+if(NOT
${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO}
VERSION_LESS 2.5.1)
+# These are the features needed by clients in order to include
the
+# project headers:
+set_property(TARGET GTK2::sigc++
+ PROPERTY INTERFACE_COMPILE_FEATURES
cxx_alias_templates
+ cxx_auto_type
+ cxx_decltype
+
cxx_deleted_functions
+ cxx_noexcept
+ cxx_nullptr
+
cxx_right_angle_brackets
+
cxx_rvalue_references
+
cxx_variadic_templates)
+endif()
endif()
_GTK2_FIND_INCLUDE_DIR(GLIBMM glibmm.h)
---
Summary of changes:
Modules/FindGTK2.cmake | 36 +++-
1 file changed, 19 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
___
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-141-g9990bef
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 9990befcd93999ac476dd78ef4c74514da0673d2 (commit)
via 33eb8fa34ba7fd86753a07555d62eef33ed92104 (commit)
from 16df189e1b4393bea525629cc7cca7da183fc5d7 (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9990befcd93999ac476dd78ef4c74514da0673d2
commit 9990befcd93999ac476dd78ef4c74514da0673d2
Merge: 16df189 33eb8fa
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Wed Oct 7 03:25:09 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Oct 7 03:25:09 2015 -0400
Merge topic 'FindGTK2_sigc++_c++11' into next
33eb8fa3 FindGTK2: Enable c++11 for sigc++ 2.5.1 or later
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33eb8fa34ba7fd86753a07555d62eef33ed92104
commit 33eb8fa34ba7fd86753a07555d62eef33ed92104
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Tue Oct 6 13:33:08 2015 +0200
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Tue Oct 6 18:19:07 2015 +0200
FindGTK2: Enable c++11 for sigc++ 2.5.1 or later
Starting with sigc++ 2.5.1, c++11 must be enabled in order to use
sigc++. The GTK2::sigc++ imported target will automatically enable the
required build flags in order to build with the version found on the
system.
diff --git a/Help/release/dev/FindGTK2_sigc++_c++11.rst
b/Help/release/dev/FindGTK2_sigc++_c++11.rst
new file mode 100644
index 000..2ba1459
--- /dev/null
+++ b/Help/release/dev/FindGTK2_sigc++_c++11.rst
@@ -0,0 +1,7 @@
+FindGTK2_sigc++_c++11
+-
+
+* Starting with sigc++ 2.5.1, c++11 must be enabled in order to use
+ sigc++. The GTK2::sigc++ imported target will automatically enable the
+ required build flags in order to build with the version found on the
+ system.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 72bb8eb..501055b 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -202,6 +202,43 @@ function(_GTK2_GET_VERSION _OUT_major _OUT_minor
_OUT_micro _gtkversion_hdr)
endif()
endfunction()
+
+#=
+# _GTK2_SIGCXX_GET_VERSION
+# Internal function to parse the version number in
+# sigc++config.h
+# _OUT_major = Major version number
+# _OUT_minor = Minor version number
+# _OUT_micro = Micro version number
+# _sigcxxversion_hdr = Header file to parse
+#=
+
+function(_GTK2_SIGCXX_GET_VERSION _OUT_major _OUT_minor _OUT_micro
_sigcxxversion_hdr)
+file(STRINGS ${_sigcxxversion_hdr} _contents REGEX "#define
SIGCXX_M[A-Z]+_VERSION[ \t]+")
+if(_contents)
+string(REGEX REPLACE ".*#define SIGCXX_MAJOR_VERSION[ \t]+([0-9]+).*"
"\\1" ${_OUT_major} "${_contents}")
+string(REGEX REPLACE ".*#define SIGCXX_MINOR_VERSION[ \t]+([0-9]+).*"
"\\1" ${_OUT_minor} "${_contents}")
+string(REGEX REPLACE ".*#define SIGCXX_MICRO_VERSION[ \t]+([0-9]+).*"
"\\1" ${_OUT_micro} "${_contents}")
+
+if(NOT ${_OUT_major} MATCHES "[0-9]+")
+message(FATAL_ERROR "Version parsing failed for
SIGCXX_MAJOR_VERSION!")
+endif()
+if(NOT ${_OUT_minor} MATCHES "[0-9]+")
+message(FATAL_ERROR "Version parsing failed for
SIGCXX_MINOR_VERSION!")
+endif()
+if(NOT ${_OUT_micro} MATCHES "[0-9]+")
+message(FATAL_ERROR "Version parsing failed for
SIGCXX_MICRO_VERSION!")
+endif()
+
+set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE)
+set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE)
+set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE)
+else()
+message(FATAL_ERROR "Include file ${_gtkversion_hdr} does not exist")
+endif()
+endfunction()
+
+
#=
# _GTK2_FIND_INCLUDE_DIR
# Internal function to find the GTK include directories
@@ -734,6 +771,25 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(SIGC++CONFIG sigc++config.h)
_GTK2_FIND_LIBRARY(SIGC++ sigc true true)
_GTK2_ADD_TARGET (SIGC++)
+# Since sigc++ 2.5.1 c++11 support is required
+_GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
+ GTK2_SIGC++_VERSION_MINOR
+
[Cmake-commits] CMake branch, next, updated. v3.3.1-3013-g87cc1f2
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 87cc1f23f451f2f0c9ca6186d1c06f00438abaac (commit)
via 7c5b6ed5c851266b4f6dae5ef864509627acdaf8 (commit)
via b04c38159eb4db35770f541f7671fe33a3f32bc2 (commit)
via 6fd548f2205c73215812fda416fbe6f0dd166bb9 (commit)
from 6968cb0bd08a46072a39ea3d0b760f7add0e71fa (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=87cc1f23f451f2f0c9ca6186d1c06f00438abaac
commit 87cc1f23f451f2f0c9ca6186d1c06f00438abaac
Merge: 6968cb0 7c5b6ed
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Thu Sep 17 08:39:30 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 17 08:39:30 2015 -0400
Merge topic 'ExternalProject_stash_save_all' into next
7c5b6ed5 ExternalProject: Use "git stash save --all" only if supported
(#15722)
b04c3815 ExternalProject: Use GIT_VERSION_STRING instead of custom method
6fd548f2 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c5b6ed5c851266b4f6dae5ef864509627acdaf8
commit 7c5b6ed5c851266b4f6dae5ef864509627acdaf8
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Thu Sep 17 11:41:07 2015 +0200
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Thu Sep 17 12:05:07 2015 +0200
ExternalProject: Use "git stash save --all" only if supported (#15722)
The --all option for git-stash wasn't introduced until git version 1.7.6.
diff --git a/Help/release/dev/ExternalProject_stash_save_all.rst
b/Help/release/dev/ExternalProject_stash_save_all.rst
new file mode 100644
index 000..e00ed44
--- /dev/null
+++ b/Help/release/dev/ExternalProject_stash_save_all.rst
@@ -0,0 +1,5 @@
+ExternalProject_stash_save_all
+--
+
+* Use "git stash save --all" only if supported. The --all option for git-stash
+ wasn't introduced until git version 1.7.6.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index db61d23..90ceedf 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -646,6 +646,11 @@ endfunction()
function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag
git_submodules git_repository work_dir)
+ if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.6)
+set(git_stash_save_options --all --quiet)
+ else()
+set(git_stash_save_options --quiet)
+ endif()
file(WRITE ${script_filename}
"if(\"${git_tag}\" STREQUAL \"\")
message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@@ -724,7 +729,7 @@ if(error_code OR is_remote_ref OR NOT (\"\${tag_sha}\"
STREQUAL \"\${head_sha}\"
# perform git pull --rebase
if(need_stash)
execute_process(
-COMMAND \"${git_EXECUTABLE}\" stash save --all --quiet
+COMMAND \"${git_EXECUTABLE}\" stash save ${git_stash_save_options}
WORKING_DIRECTORY \"${work_dir}\"
RESULT_VARIABLE error_code
)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b04c38159eb4db35770f541f7671fe33a3f32bc2
commit b04c38159eb4db35770f541f7671fe33a3f32bc2
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Thu Sep 17 11:19:36 2015 +0200
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Thu Sep 17 11:47:26 2015 +0200
ExternalProject: Use GIT_VERSION_STRING instead of custom method
GIT_VERSION_STRING is available in FindGit.cmake since CMake version 2.8.8
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0fbf7c3..db61d23 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1631,20 +1631,6 @@ function(_ep_add_mkdir_command name)
endfunction()
-function(_ep_get_git_version git_EXECUTABLE git_version_var)
- if(git_EXECUTABLE)
-execute_process(
- COMMAND "${git_EXECUTABLE}" --version
- OUTPUT_VARIABLE ov
- ERROR_VARIABLE ev
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-string(REGEX REPLACE "^git version (.+)$" "\\1" version "${ov}")
-set(${git_version_var} "${version}" PARENT_SCOPE)
- endif()
-endfunction()
-
-
function(_ep_is_dir_empty dir empty_var)
file(GLOB gr "${dir}/*")
if("${gr}" STREQUAL "")
@@ -1747,8 +1733,7 @@ function(_ep_add_download_command name)
# The git submodule update '--re
[Cmake-commits] CMake branch, next, updated. v3.2.2-3252-g4bb795b
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 4bb795b709ebbd2b53d841bb810f4d1a7e6505aa (commit)
via d4c6531a945564d230200512c680ca8570b10a6c (commit)
from e932b3553022e6b023c40b0a207f3e16e409dd30 (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=4bb795b709ebbd2b53d841bb810f4d1a7e6505aa
commit 4bb795b709ebbd2b53d841bb810f4d1a7e6505aa
Merge: e932b35 d4c6531
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri May 29 14:04:05 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 29 14:04:05 2015 -0400
Merge topic 'FindPkgConfig_fix_extra_path' into next
d4c6531a FindPkgConfig: Fix extra paths for
CMAKE_{FRAMEWORK,APPBUNDLE}_PATH vars
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4c6531a945564d230200512c680ca8570b10a6c
commit d4c6531a945564d230200512c680ca8570b10a6c
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri May 29 18:50:59 2015 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri May 29 19:22:57 2015 +0200
FindPkgConfig: Fix extra paths for CMAKE_{FRAMEWORK,APPBUNDLE}_PATH vars
The CMAKE_FRAMEWORK_PATH and CMAKE_APPBUNDLE_PATH cache variables are
supposed to be used to generate the extra paths passed to pkg-config,
but instead the CMAKE_PREFIX_PATH variable is used.
This bug was introduced by the refactor in commit v3.1.0-rc1~747^2~1.
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 64ccde5..53c17f1 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -149,7 +149,7 @@ function(_pkgconfig_add_extra_path _extra_paths_var _var)
endif()
if(NOT _is_env)
if(NOT ${${_var}} STREQUAL )
- list(APPEND ${_extra_paths_var} ${CMAKE_PREFIX_PATH})
+ list(APPEND ${_extra_paths_var} ${${_var}})
endif()
else()
if(NOT $ENV{${_var}} STREQUAL )
diff --git
a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake
new file mode 100644
index 000..9d4826f
--- /dev/null
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_CMAKE_APPBUNDLE_PATH.cmake
@@ -0,0 +1,51 @@
+# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE and
FIND_LIBRARY_USE_LIB64_PATHS
+enable_language(C)
+
+# Prepare environment and variables
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
+set(CMAKE_APPBUNDLE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/pc-foo)
+if(WIN32)
+set(PKG_CONFIG_EXECUTABLE
${CMAKE_CURRENT_SOURCE_DIR}\\dummy-pkg-config.bat)
+set(ENV{CMAKE_APPBUNDLE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}\\pc-bar;X:\\this\\directory\\should\\not\\exist\\in\\the\\filesystem)
+set(ENV{PKG_CONFIG_PATH} C:\\baz)
+else()
+set(PKG_CONFIG_EXECUTABLE
${CMAKE_CURRENT_SOURCE_DIR}/dummy-pkg-config.sh)
+set(ENV{CMAKE_APPBUNDLE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/pc-bar:/this/directory/should/not/exist/in/the/filesystem)
+set(ENV{PKG_CONFIG_PATH} /baz)
+endif()
+
+
+find_package(PkgConfig)
+
+
+if(NOT DEFINED CMAKE_SYSTEM_NAME
+OR (CMAKE_SYSTEM_NAME MATCHES ^(Linux|kFreeBSD|GNU)$
+AND NOT CMAKE_CROSSCOMPILING))
+ if(EXISTS /etc/debian_version) # is this a debian system ?
+if(CMAKE_LIBRARY_ARCHITECTURE MATCHES
^(i386-linux-gnu|x86_64-linux-gnu)$)
+ # Cannot create directories for all the existing architectures...
+ set(expected_path
/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig)
+else()
+ set(expected_path
/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig)
+endif()
+ else()
+# not debian, chech the FIND_LIBRARY_USE_LIB64_PATHS property
+get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+if(uselib64)
+ set(expected_path
/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib64/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig)
+endif()
+ endif()
+else()
+ if(WIN32)
+set(expected_path
C:\\baz;${CMAKE_CURRENT_SOURCE_DIR}\\pc-foo\\lib\\pkgconfig;${CMAKE_CURRENT_SOURCE_DIR}\\pc-bar\\lib\\pkgconfig)
+ else()
+set(expected_path
/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig)
+ endif()
+endif
[Cmake-commits] CMake branch, next, updated. v3.1.0-1330-g15162ca
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 15162ca3106d95b0f867b9a89d9b3a6dd0008297 (commit) via 64016393109cee55b3307d6669343e627d709e20 (commit) from bf87becbc3d333ee1902226787aca69142789855 (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=15162ca3106d95b0f867b9a89d9b3a6dd0008297 commit 15162ca3106d95b0f867b9a89d9b3a6dd0008297 Merge: bf87bec 6401639 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Mon Dec 22 11:25:59 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Dec 22 11:25:59 2014 -0500 Merge topic 'CPackComponent-docs-fix' into next 64016393 Help: Small fixes in CPackComponent documentation http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64016393109cee55b3307d6669343e627d709e20 commit 64016393109cee55b3307d6669343e627d709e20 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Mon Dec 22 10:29:05 2014 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Mon Dec 22 17:23:46 2014 +0100 Help: Small fixes in CPackComponent documentation diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake index 5524a3f..573e5aa 100644 --- a/Modules/CPackComponent.cmake +++ b/Modules/CPackComponent.cmake @@ -110,7 +110,7 @@ # # DESCRIPTION is an extended description of the component, used in # graphical installers to give the user additional information about the -# component. Descriptions can span multiple lines using \n as the +# component. Descriptions can span multiple lines using ``\n`` as the # line separator. Typically, these descriptions should be no more than # a few lines long. # @@ -185,7 +185,7 @@ # DESCRIPTION is an extended description of the component group, used in # graphical installers to give the user additional information about the # components within that group. Descriptions can span multiple lines -# using \n as the line separator. Typically, these descriptions +# using ``\n`` as the line separator. Typically, these descriptions # should be no more than a few lines long. # # PARENT_GROUP, if supplied, names the parent group of this group. --- Summary of changes: Modules/CPackComponent.cmake |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1117-g677d66d
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 677d66d06472560a5c9dedfec73e093ee40db2c6 (commit)
via 636f0c1d4fa3f003fff406b27306cd6883bcec75 (commit)
via c90633df9eacb3063669ac0aad9506cea1885582 (commit)
from 6fe28452898c3fea0bf021cacfe0885686e517dd (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=677d66d06472560a5c9dedfec73e093ee40db2c6
commit 677d66d06472560a5c9dedfec73e093ee40db2c6
Merge: 6fe2845 636f0c1
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri Dec 5 04:29:03 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 5 04:29:03 2014 -0500
Merge topic 'ExternalProject_TEST_EXCLUDE_FROM_MAIN' into next
636f0c1d ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
c90633df CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=636f0c1d4fa3f003fff406b27306cd6883bcec75
commit 636f0c1d4fa3f003fff406b27306cd6883bcec75
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Sun Nov 30 22:28:43 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Dec 5 10:24:16 2014 +0100
ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
If this option is enabled, the test step is created with the
EXCLUDE_FROM_MAIN option, and if TEST_BEFORE_INSTALL is enabled, the
install step does not depend on the test step.
This means that the test step is never executed, unless the test target
is explicitly created by calling ExternalProject_Add_StepTarget, or by
passing it with the STEP_TARGETS option, or with the EP_STEP_TARGETS
directory property.
diff --git a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
new file mode 100644
index 000..dfbf108
--- /dev/null
+++ b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
@@ -0,0 +1,6 @@
+ExternalProject_TEST_EXCLUDE_FROM_MAIN
+--
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+ command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
+ from the main build.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index e5616b1..7e4cc37 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -149,6 +149,8 @@ Create custom targets to build projects in external trees
Add test step executed before install step
``TEST_AFTER_INSTALL 1``
Add test step executed after install step
+ ``TEST_EXCLUDE_FROM_MAIN 1``
+Main target does not depend on the test step
``TEST_COMMAND cmd...``
Command to drive test
@@ -2193,12 +2195,13 @@ function(_ep_add_test_command name)
get_property(before TARGET ${name} PROPERTY _EP_TEST_BEFORE_INSTALL)
get_property(after TARGET ${name} PROPERTY _EP_TEST_AFTER_INSTALL)
+ get_property(exclude TARGET ${name} PROPERTY _EP_TEST_EXCLUDE_FROM_MAIN)
get_property(cmd_set TARGET ${name} PROPERTY _EP_TEST_COMMAND SET)
# Only actually add the test step if one of the test related properties is
# explicitly set. (i.e. the test step is omitted unless requested...)
#
- if(cmd_set OR before OR after)
+ if(cmd_set OR before OR after OR exclude)
if(cmd_set)
get_property(cmd TARGET ${name} PROPERTY _EP_TEST_COMMAND)
else()
@@ -2206,9 +2209,21 @@ function(_ep_add_test_command name)
endif()
if(before)
- set(dep_args DEPENDEES build DEPENDERS install)
+ set(dependees_args DEPENDEES build)
else()
- set(dep_args DEPENDEES install)
+ set(dependees_args DEPENDEES install)
+endif()
+
+if(exclude)
+ set(dependers_args )
+ set(exclude_args EXCLUDE_FROM_MAIN 1)
+else()
+ if(before)
+set(dependers_args DEPENDERS install)
+ else()
+set(dependers_args )
+ endif()
+ set(exclude_args )
endif()
get_property(log TARGET ${name} PROPERTY _EP_LOG_TEST)
@@ -2221,7 +2236,9 @@ function(_ep_add_test_command name)
ExternalProject_Add_Step(${name} test
COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir}
- ${dep_args}
+ ${dependees_args}
+ ${dependers_args}
+ ${exclude_args}
${log}
)
endif()
diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt
b/Tests/ExternalProjectLocal/CMakeLists.txt
index cbbb555..9476ab4 100644
--- a/Tests/ExternalProjectLocal/CMakeLists.txt
+++ b/Tests/ExternalProjectLocal/CMakeLists.txt
@@ -71,6 +71,31 @@ if(can_build_tutorial_step5)
LOG_TEST
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1082-g72edefc
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 72edefcf8a04d5ee9404cccd33090dd0d2025005 (commit)
via 0bdf24548b2059d9e11520f2de492b4847aefb8f (commit)
via 0f381ad5218758aadf92bbd4e5d68347a06cc3ab (commit)
from b7f1ba1691b6b49947eaba55bf506ffc63eafa70 (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=72edefcf8a04d5ee9404cccd33090dd0d2025005
commit 72edefcf8a04d5ee9404cccd33090dd0d2025005
Merge: b7f1ba1 0bdf245
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Dec 4 05:28:53 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Dec 4 05:28:53 2014 -0500
Merge topic 'ExternalProject_TEST_EXCLUDE_FROM_MAIN' into next
0bdf2454 ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
0f381ad5 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bdf24548b2059d9e11520f2de492b4847aefb8f
commit 0bdf24548b2059d9e11520f2de492b4847aefb8f
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Sun Nov 30 22:28:43 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Dec 4 11:27:19 2014 +0100
ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
If this option is enabled, the test step is created with the
EXCLUDE_FROM_MAIN option, and if TEST_BEFORE_INSTALL is enabled, the
install step does not depend on the test step.
This means that the test step is never executed, unless the test target
is explicitly created by calling ExternalProject_Add_StepTarget, or by
passing it with the STEP_TARGETS option, or with the EP_STEP_TARGETS
directory property.
diff --git a/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
new file mode 100644
index 000..dfbf108
--- /dev/null
+++ b/Help/release/dev/ExternalProject_TEST_EXCLUDE_FROM_MAIN.rst
@@ -0,0 +1,6 @@
+ExternalProject_TEST_EXCLUDE_FROM_MAIN
+--
+
+* The :module:`ExternalProject` module :command:`ExternalProject_Add`
+ command learned a ``TEST_EXCLUDE_FROM_MAIN`` option to exclude tests
+ from the main build.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index e5616b1..7e4cc37 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -149,6 +149,8 @@ Create custom targets to build projects in external trees
Add test step executed before install step
``TEST_AFTER_INSTALL 1``
Add test step executed after install step
+ ``TEST_EXCLUDE_FROM_MAIN 1``
+Main target does not depend on the test step
``TEST_COMMAND cmd...``
Command to drive test
@@ -2193,12 +2195,13 @@ function(_ep_add_test_command name)
get_property(before TARGET ${name} PROPERTY _EP_TEST_BEFORE_INSTALL)
get_property(after TARGET ${name} PROPERTY _EP_TEST_AFTER_INSTALL)
+ get_property(exclude TARGET ${name} PROPERTY _EP_TEST_EXCLUDE_FROM_MAIN)
get_property(cmd_set TARGET ${name} PROPERTY _EP_TEST_COMMAND SET)
# Only actually add the test step if one of the test related properties is
# explicitly set. (i.e. the test step is omitted unless requested...)
#
- if(cmd_set OR before OR after)
+ if(cmd_set OR before OR after OR exclude)
if(cmd_set)
get_property(cmd TARGET ${name} PROPERTY _EP_TEST_COMMAND)
else()
@@ -2206,9 +2209,21 @@ function(_ep_add_test_command name)
endif()
if(before)
- set(dep_args DEPENDEES build DEPENDERS install)
+ set(dependees_args DEPENDEES build)
else()
- set(dep_args DEPENDEES install)
+ set(dependees_args DEPENDEES install)
+endif()
+
+if(exclude)
+ set(dependers_args )
+ set(exclude_args EXCLUDE_FROM_MAIN 1)
+else()
+ if(before)
+set(dependers_args DEPENDERS install)
+ else()
+set(dependers_args )
+ endif()
+ set(exclude_args )
endif()
get_property(log TARGET ${name} PROPERTY _EP_LOG_TEST)
@@ -2221,7 +2236,9 @@ function(_ep_add_test_command name)
ExternalProject_Add_Step(${name} test
COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir}
- ${dep_args}
+ ${dependees_args}
+ ${dependers_args}
+ ${exclude_args}
${log}
)
endif()
diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt
b/Tests/ExternalProjectLocal/CMakeLists.txt
index cbbb555..a71c869 100644
--- a/Tests/ExternalProjectLocal/CMakeLists.txt
+++ b/Tests/ExternalProjectLocal/CMakeLists.txt
@@ -71,6 +71,31 @@ if(can_build_tutorial_step5)
LOG_TEST
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-345-g562a7b8
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 562a7b835a21cc395c76fde720f94d0547a6 (commit)
via aba5cec6b262c392bfd9f94176a80113d1315917 (commit)
via 3f606fa7d06a209cc2cd3a97afb84951d1c4c033 (commit)
via c0b749cf62a2e985c2b1f94ff919107dbd697b2c (commit)
via 917da5d02766e875ec63eca09eb52b789114674c (commit)
from ebac33c84bb11f9fede15a5fc2d929ab5355331d (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=562a7b835a21cc395c76fde720f94d0547a6
commit 562a7b835a21cc395c76fde720f94d0547a6
Merge: ebac33c aba5cec
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Nov 6 09:13:58 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Nov 6 09:13:58 2014 -0500
Merge topic 'ExternalProject_UPDATE_DISCONNECTED' into next
aba5cec6 ExternalProject: Add unit tests for UPDATE_DISCONNECTED
3f606fa7 ExternalProject: Add UPDATE_DISCONNECTED option
c0b749cf ExternalProject: Always add a command to a step
917da5d0 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aba5cec6b262c392bfd9f94176a80113d1315917
commit aba5cec6b262c392bfd9f94176a80113d1315917
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Nov 5 00:31:43 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Nov 6 15:09:44 2014 +0100
ExternalProject: Add unit tests for UPDATE_DISCONNECTED
diff --git a/Tests/ExternalProjectUpdate/CMakeLists.txt
b/Tests/ExternalProjectUpdate/CMakeLists.txt
index 582b0a8..fbb3388 100644
--- a/Tests/ExternalProjectUpdate/CMakeLists.txt
+++ b/Tests/ExternalProjectUpdate/CMakeLists.txt
@@ -72,6 +72,18 @@ if(do_git_tests)
)
ExternalProject_Add_StepDependencies(${proj} download
SetupLocalGITRepository)
set_property(TARGET ${proj} PROPERTY FOLDER GIT)
+
+ set(proj TutorialStep2-GIT)
+ ExternalProject_Add(${proj}
+GIT_REPOSITORY ${local_git_repo}
+GIT_TAG ${TEST_GIT_TAG}
+CMAKE_GENERATOR ${CMAKE_GENERATOR}
+CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
+INSTALL_COMMAND
+UPDATE_DISCONNECTED 1
+ )
+ ExternalProject_Add_StepDependencies(${proj} download
SetupLocalGITRepository)
+ set_property(TARGET ${proj} PROPERTY FOLDER GIT)
endif()
diff --git a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake
b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake
index 6c7bcfe..7065f36 100644
--- a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake
+++ b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake
@@ -59,6 +59,102 @@ was expected.
if( EXISTS ${FETCH_HEAD_file} AND NOT ${fetch_expected})
message( FATAL_ERROR Fetch DID occur when it was not expected.)
endif()
+
+ message( STATUS Checking ExternalProjectUpdate to tag: ${desired_tag}
(disconnected) )
+
+ # Remove the FETCH_HEAD file, so we can check if it gets replaced with a 'git
+ # fetch'.
+ set( FETCH_HEAD_file
${ExternalProjectUpdate_BINARY_DIR}/CMakeExternals/Source/TutorialStep2-GIT/.git/FETCH_HEAD
)
+ file( REMOVE ${FETCH_HEAD_file} )
+
+ # Check initial SHA
+ execute_process(COMMAND ${GIT_EXECUTABLE}
+rev-list --max-count=1 HEAD
+WORKING_DIRECTORY
${ExternalProjectUpdate_BINARY_DIR}/CMakeExternals/Source/TutorialStep2-GIT
+RESULT_VARIABLE error_code
+OUTPUT_VARIABLE initial_sha
+OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+ # Configure
+ execute_process(COMMAND ${CMAKE_COMMAND}
+-G ${CMAKE_GENERATOR} -T ${CMAKE_GENERATOR_TOOLSET}
+-A ${CMAKE_GENERATOR_PLATFORM}
+-DTEST_GIT_TAG:STRING=${desired_tag}
+${ExternalProjectUpdate_SOURCE_DIR}
+WORKING_DIRECTORY ${ExternalProjectUpdate_BINARY_DIR}
+RESULT_VARIABLE error_code
+)
+ if(error_code)
+message(FATAL_ERROR Could not configure the project.)
+ endif()
+
+ # Build
+ execute_process(COMMAND ${CMAKE_COMMAND}
+--build ${ExternalProjectUpdate_BINARY_DIR}
+RESULT_VARIABLE error_code
+)
+ if(error_code)
+message(FATAL_ERROR Could not build the project.)
+ endif()
+
+ if( EXISTS ${FETCH_HEAD_file} )
+message( FATAL_ERROR Fetch occured when it was not expected.)
+ endif()
+
+ # Check the resulting SHA
+ execute_process(COMMAND ${GIT_EXECUTABLE}
+rev-list --max-count=1 HEAD
+WORKING_DIRECTORY
${ExternalProjectUpdate_BINARY_DIR}/CMakeExternals/Source/TutorialStep2-GIT
+RESULT_VARIABLE error_code
+OUTPUT_VARIABLE tag_sha
+OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+ if(error_code)
+message(FATAL_ERROR Could not check the sha
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-282-gef1dba5
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 ef1dba5e8d56295285bd424e875b4fcdcae6f456 (commit)
via 67cfbf8eb7cb2ad0e177b68aa134bc65297929fb (commit)
via f598f1aa836f7c9a60bc59b53ebbc2faae24f5a4 (commit)
via 4ae133e09c763beb5a55302fdc1502abff6ff8d3 (commit)
from 02309bcd679cc46e18df15919fc69402514cbf04 (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=ef1dba5e8d56295285bd424e875b4fcdcae6f456
commit ef1dba5e8d56295285bd424e875b4fcdcae6f456
Merge: 02309bc 67cfbf8
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Nov 3 10:17:33 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Nov 3 10:17:33 2014 -0500
Merge topic 'ExternalProject_independent-step-targets' into next
67cfbf8e ExternalProject: Add unit tests
f598f1aa ExternalProject: Add ExternalProject_Add_StepDependencies function
4ae133e0 ExternalProject: Add independent step targets
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67cfbf8eb7cb2ad0e177b68aa134bc65297929fb
commit 67cfbf8eb7cb2ad0e177b68aa134bc65297929fb
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Nov 3 16:14:54 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Nov 3 16:15:14 2014 +0100
ExternalProject: Add unit tests
diff --git a/Tests/ExternalProjectUpdate/CMakeLists.txt
b/Tests/ExternalProjectUpdate/CMakeLists.txt
index c33e90b..582b0a8 100644
--- a/Tests/ExternalProjectUpdate/CMakeLists.txt
+++ b/Tests/ExternalProjectUpdate/CMakeLists.txt
@@ -19,6 +19,7 @@ set(base ${CMAKE_BINARY_DIR}/CMakeExternals)
set(binary_base ${base}/Build)
set_property(DIRECTORY PROPERTY EP_BASE ${base})
set_property(DIRECTORY PROPERTY EP_STEP_TARGETS configure build test)
+set_property(DIRECTORY PROPERTY EP_INDEPENDENT_STEP_TARGETS update)
set(do_git_tests 0)
@@ -68,8 +69,8 @@ if(do_git_tests)
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
-DEPENDS SetupLocalGITRepository
)
+ ExternalProject_Add_StepDependencies(${proj} download
SetupLocalGITRepository)
set_property(TARGET ${proj} PROPERTY FOLDER GIT)
endif()
diff --git a/Tests/RunCMake/ExternalProject/Add_StepDependencies.cmake
b/Tests/RunCMake/ExternalProject/Add_StepDependencies.cmake
new file mode 100644
index 000..38683f1
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/Add_StepDependencies.cmake
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
+
+include(ExternalProject)
+
+ExternalProject_Add(BAR URL https://cmake.org/bar.tar.gz)
+
+ExternalProject_Add(FOO URL https://cmake.org/foo.tar.gz STEP_TARGETS update)
+ExternalProject_Add_Step(FOO do_something COMMAND ${CMAKE_COMMAND} -E echo
Doing something)
+ExternalProject_Add_Step(FOO do_something_else COMMAND ${CMAKE_COMMAND} -E
echo Doing something else)
+ExternalProject_Add_StepTargets(FOO do_something)
+
+# download and do_something_else are not targets, but the file-level
+# dependency are set.
+ExternalProject_Add_StepDependencies(FOO download BAR)
+ExternalProject_Add_StepDependencies(FOO do_something_else BAR)
+
+# update and do_something are targets, therefore both file-level and
+# target-level dependencies are set.
+ExternalProject_Add_StepDependencies(FOO update BAR)
+ExternalProject_Add_StepDependencies(FOO do_something BAR)
diff --git
a/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target.cmake
b/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target.cmake
new file mode 100644
index 000..264c3f0
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/Add_StepDependencies_no_target.cmake
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
+
+include(ExternalProject)
+
+ExternalProject_Add(BAR URL https://cmake.org/bar.tar.gz)
+
+ExternalProject_Add(FOO URL https://cmake.org/foo.tar.gz STEP_TARGETS update)
+ExternalProject_Add_Step(FOO do_something COMMAND ${CMAKE_COMMAND} -E echo
Doing something)
+ExternalProject_Add_Step(FOO do_something_else COMMAND ${CMAKE_COMMAND} -E
echo Doing something else)
+ExternalProject_Add_StepTargets(FOO do_something)
diff --git a/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
b/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
new file mode 100644
index 000..4cb051d
--- /dev/null
+++ b/Tests/RunCMake/ExternalProject/NO_DEPENDS-stderr.txt
@@ -0,0 +1,36 @@
+CMake Warning \(dev\) at .*/Modules/ExternalProject.cmake:[0-9]+. \(message\):
+ Using NO_DEPENDS for configure step might break parallel builds
+Call
[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-219-g0d58a36
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 0d58a36ede819753219c5f417db001182ade3ff9 (commit)
via fdbfbaaa3297b5a7f32a52822d9d80319ccfe7ff (commit)
via 8c951a35da6bc6554e596a6e07d3db1e61cd7877 (commit)
via ff7da72d3271cb9d4b1760c9c5a45b326027ee3c (commit)
via b3bd0fb10ce3a449477913278646997bef23a988 (commit)
from 2d1d312f9812366f5a84edfc3aecd3566f62b60a (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=0d58a36ede819753219c5f417db001182ade3ff9
commit 0d58a36ede819753219c5f417db001182ade3ff9
Merge: 2d1d312 fdbfbaa
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Oct 30 13:46:53 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Oct 30 13:46:53 2014 -0400
Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS' into next
fdbfbaaa Extend ExternalProjectLocal test to cover CMAKE_CACHE_DEFAULT_ARGS
8c951a35 Fix Tutorial tests when USE_MYMATH is OFF
ff7da72d ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGS
b3bd0fb1 ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS arguments
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdbfbaaa3297b5a7f32a52822d9d80319ccfe7ff
commit fdbfbaaa3297b5a7f32a52822d9d80319ccfe7ff
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Oct 30 12:34:34 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Oct 30 18:24:15 2014 +0100
Extend ExternalProjectLocal test to cover CMAKE_CACHE_DEFAULT_ARGS
diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt
b/Tests/ExternalProjectLocal/CMakeLists.txt
index f942197..cbbb555 100644
--- a/Tests/ExternalProjectLocal/CMakeLists.txt
+++ b/Tests/ExternalProjectLocal/CMakeLists.txt
@@ -66,6 +66,7 @@ if(can_build_tutorial_step5)
ExternalProject_Add(${proj}
URL ${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR -G ${CMAKE_GENERATOR}
SOURCE_DIR
+CMAKE_CACHE_DEFAULT_ARGS -DUSE_MYMATH:BOOL=OFF
TEST_AFTER_INSTALL 1
LOG_TEST 1
)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c951a35da6bc6554e596a6e07d3db1e61cd7877
commit 8c951a35da6bc6554e596a6e07d3db1e61cd7877
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Oct 30 12:23:27 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Oct 30 18:24:14 2014 +0100
Fix Tutorial tests when USE_MYMATH is OFF
Unit tests for the square root of -25 currently fail when USE_MYMATH
is disabled. The mysqrt method in the tutorials, returns 0 for a
negative value, while sqrt returns NaN, and therefore the output is
not accepted by the test.
This patch checks if the number is negative and eventually returns 0
before calling sqrt or mysqrt to fix this issue.
Printing a NaN might cause issues with the string catched by the tests
on some platform. Therefore assume that 0 is correct and fix the
USE_MYMATH=OFF version by checking if the number is negative and
eventually returning 0 before calling sqrt or mysqrt.
diff --git a/Tests/Tutorial/Step2/tutorial.cxx
b/Tests/Tutorial/Step2/tutorial.cxx
index 82b416f..c27da0b 100644
--- a/Tests/Tutorial/Step2/tutorial.cxx
+++ b/Tests/Tutorial/Step2/tutorial.cxx
@@ -21,12 +21,16 @@ int main (int argc, char *argv[])
}
double inputValue = atof(argv[1]);
+ double outputValue = 0;
+ if(inputValue = 0)
+{
#ifdef USE_MYMATH
- double outputValue = mysqrt(inputValue);
+outputValue = mysqrt(inputValue);
#else
- double outputValue = sqrt(inputValue);
+outputValue = sqrt(inputValue);
#endif
+}
fprintf(stdout,The square root of %g is %g\n,
inputValue, outputValue);
diff --git a/Tests/Tutorial/Step3/tutorial.cxx
b/Tests/Tutorial/Step3/tutorial.cxx
index 82b416f..c27da0b 100644
--- a/Tests/Tutorial/Step3/tutorial.cxx
+++ b/Tests/Tutorial/Step3/tutorial.cxx
@@ -21,12 +21,16 @@ int main (int argc, char *argv[])
}
double inputValue = atof(argv[1]);
+ double outputValue = 0;
+ if(inputValue = 0)
+{
#ifdef USE_MYMATH
- double outputValue = mysqrt(inputValue);
+outputValue = mysqrt(inputValue);
#else
- double outputValue = sqrt(inputValue);
+outputValue = sqrt(inputValue);
#endif
+}
fprintf(stdout,The square root of %g is %g\n,
inputValue, outputValue);
diff --git a/Tests/Tutorial/Step4/tutorial.cxx
b/Tests/Tutorial/Step4/tutorial.cxx
index 82b416f..c27da0b 100644
--- a/Tests/Tutorial/Step4/tutorial.cxx
[Cmake-commits] CMake branch, next, updated. v3.0.0-4544-g309d1a6
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 309d1a645e358d0b88414d6b95e0d13185d8c1f6 (commit)
via 8bab4454afa9e364d1ff08501309b902e65d98f2 (commit)
via b01fdb58b36bcd6694cf6c5d02a3db70f3befc82 (commit)
via 9528e6a6a17a43207fb22e051fa7df06a8844223 (commit)
via 855e76e90d249664fafb66b9f0b2d37cfc508a40 (commit)
from dea3d880aff4e50131a1ebf3ad082a70826f1e0c (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=309d1a645e358d0b88414d6b95e0d13185d8c1f6
commit 309d1a645e358d0b88414d6b95e0d13185d8c1f6
Merge: dea3d88 8bab445
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Jul 28 11:06:30 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Jul 28 11:06:30 2014 -0400
Merge topic 'CMakePackageConfigHelpers_build_tree' into next
8bab4454 CMakePackageConfigHelpers: Add unit tests for BUILD_TREE option
b01fdb58 CMakePackageConfigHelpers: Add BUILD_TREE option
9528e6a6 CMakePackageConfigHelpers: restructure documentation and document
commands
855e76e9 CMakePackageConfigHelpers: Remove unused variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bab4454afa9e364d1ff08501309b902e65d98f2
commit 8bab4454afa9e364d1ff08501309b902e65d98f2
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Jul 15 19:51:16 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Jul 28 17:03:06 2014 +0200
CMakePackageConfigHelpers: Add unit tests for BUILD_TREE option
diff --git a/Tests/FindPackageTest/CMakeLists.txt
b/Tests/FindPackageTest/CMakeLists.txt
index 092bf20..5a81b44 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -374,6 +374,7 @@ endif()
include(CMakePackageConfigHelpers)
+# Generate a config file ready to be installed.
set(INCLUDE_INSTALL_DIR include )
set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/ )
set(CURRENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} )
@@ -407,6 +408,43 @@ if(Relocatable_FOUND)
message(SEND_ERROR Relocatable_FOUND set to TRUE !)
endif()
+# Generate a config file for the build tree.
+set(INCLUDE_INSTALL_DIR include )
+set(SHARE_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/share/ )
+set(CURRENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} )
+
+configure_package_config_file(RelocatableConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/RelocatableConfig.cmake
+ INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+ PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR
CURRENT_BUILD_DIR
+ BUILD_TREE
+ )
+
+set(Relocatable_FIND_COMPONENTS AComp BComp CComp)
+set(Relocatable_FIND_REQUIRED_BComp 1)
+include(${CMAKE_CURRENT_BINARY_DIR}/RelocatableConfig.cmake)
+
+if(NOT ${RELOC_INCLUDE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR}/include)
+ message(SEND_ERROR RELOC_INCLUDE_DIR set by configure_package_config_file()
is set to \${RELOC_INCLUDE_DIR}\ (expected
\${CMAKE_CURRENT_BINARY_DIR}/include\))
+endif()
+
+if(NOT ${RELOC_SHARE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR}/share/)
+ message(SEND_ERROR RELOC_SHARE_DIR set by configure_package_config_file()
is set to \${RELOC_SHARE_DIR}\ (expected
\${CMAKE_CURRENT_BINARY_DIR}/share/\))
+endif()
+
+if(NOT ${RELOC_BUILD_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
+ message(SEND_ERROR RELOC_BUILD_DIR set by configure_package_config_file()
is set to \${RELOC_BUILD_DIR}\ (expected \${CMAKE_CURRENT_BINARY_DIR}\))
+endif()
+
+if(NOT DEFINED Relocatable_FOUND)
+ message(SEND_ERROR Relocatable_FOUND not defined !)
+endif()
+
+if(Relocatable_FOUND)
+ message(SEND_ERROR Relocatable_FOUND set to TRUE !)
+endif()
+
+
+
#-
# Test write_basic_config_version_file().
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b01fdb58b36bcd6694cf6c5d02a3db70f3befc82
commit b01fdb58b36bcd6694cf6c5d02a3db70f3befc82
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Jul 15 19:10:54 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Jul 28 17:03:06 2014 +0200
CMakePackageConfigHelpers: Add BUILD_TREE option
This option instructs configure_package_config_file to consider paths
that are not absolute as relative to the CMAKE_BINARY_DIR directory
instead of relative to the CMAKE_INSTALL_PREFIX` directory.
The new signature is therefore:
configure_package_config_file(input
[Cmake-commits] CMake branch, next, updated. v3.0.0-4253-gf49799e
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 f49799e996088f1bab6828be8df5ad818f45762e (commit)
via e475c067c5f738d46cd28ce1a0cf03f7404590d8 (commit)
via 7bc84502513febf4e5e974f3d4285baa53f0afb9 (commit)
from 2fbe31fab2ec28c42c9bee918653f3501500aca8 (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=f49799e996088f1bab6828be8df5ad818f45762e
commit f49799e996088f1bab6828be8df5ad818f45762e
Merge: 2fbe31f e475c06
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Tue Jul 15 09:14:12 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Jul 15 09:14:12 2014 -0400
Merge topic 'fix_Xcode_generator_name' into next
e475c067 Fix Xcode generator name
7bc84502 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e475c067c5f738d46cd28ce1a0cf03f7404590d8
commit e475c067c5f738d46cd28ce1a0cf03f7404590d8
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Jul 15 10:45:53 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Jul 15 10:46:34 2014 +0200
Fix Xcode generator name
The generator name is Xcode, not XCode
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dc4f894..d25986b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -77,7 +77,7 @@ if(BUILD_TESTING)
# some old versions of make simply cannot handle spaces in paths
if (MAKE_IS_GNU OR
CMAKE_MAKE_PROGRAM MATCHES nmake|gmake|wmake OR
- CMAKE_GENERATOR MATCHES Visual Studio|XCode|Borland)
+ CMAKE_GENERATOR MATCHES Visual Studio|Xcode|Borland)
set(MAKE_SUPPORTS_SPACES 1)
else()
set(MAKE_SUPPORTS_SPACES 0)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index f74d17e..145d312 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -1,7 +1,7 @@
include(RunCMake)
run_cmake(CommandConflict)
-if(${RunCMake_GENERATOR} MATCHES Visual Studio OR ${RunCMake_GENERATOR}
MATCHES XCode )
+if(${RunCMake_GENERATOR} MATCHES Visual Studio OR ${RunCMake_GENERATOR}
MATCHES Xcode )
run_cmake(OutputConflict)
endif()
run_cmake(EmptyCondition1)
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Tests/CMakeLists.txt|2 +-
Tests/RunCMake/File_Generate/RunCMakeTest.cmake |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3212-gd9a618b
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 d9a618b3535c7ab0bed98c4e788ec47334877c83 (commit)
via 1890c668e92b8bcd60075cf0a5a70411da2a2444 (commit)
via 81a3f228824058849368f9c3a8e318c02fa03097 (commit)
from d409750325ca6d5abc1f75f2eb25f4e893f0a972 (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=d9a618b3535c7ab0bed98c4e788ec47334877c83
commit d9a618b3535c7ab0bed98c4e788ec47334877c83
Merge: d409750 1890c66
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon May 19 10:55:47 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 19 10:55:47 2014 -0400
Merge topic 'preserve_cmake_minimum_required_version' into next
1890c668 Keep cmake_minimum_required calls in sync with current version
81a3f228 Do not change minimum required version in modules
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1890c668e92b8bcd60075cf0a5a70411da2a2444
commit 1890c668e92b8bcd60075cf0a5a70411da2a2444
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue May 13 11:02:19 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon May 19 16:55:12 2014 +0200
Keep cmake_minimum_required calls in sync with current version
Update cmake_minimum_required calls in CMakeLists.txt in Modules and in
CMakeLists.txt generated by other modules, so that they are always in
sync with current CMake version.
diff --git a/Modules/CheckLanguage.cmake b/Modules/CheckLanguage.cmake
index 3bd126a..99c809b 100644
--- a/Modules/CheckLanguage.cmake
+++ b/Modules/CheckLanguage.cmake
@@ -47,7 +47,7 @@ macro(check_language lang)
message(STATUS ${_desc})
file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang})
file(WRITE
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang}/CMakeLists.txt
- cmake_minimum_required(VERSION 2.8)
+ cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(Check${lang} ${lang})
file(WRITE \\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\
\set(CMAKE_${lang}_COMPILER ${CMAKE_${lang}_COMPILER}\\\)\\n\
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 8b22ff7..5fa40a5 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -183,7 +183,7 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND
SDL_SOUND_LIBRARY)
# in the SDL_LIBRARY string after the -framework.
# But if I quote the stuff in INCLUDE_DIRECTORIES, it doesn't work.
file(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/CMakeLists.txt
- cmake_minimum_required(VERSION 2.8)
+ cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(DetermineSoundLibs)
include_directories(${SDL_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
add_executable(DetermineSoundLibs DetermineSoundLibs.c)
diff --git a/Modules/FortranCInterface/CMakeLists.txt
b/Modules/FortranCInterface/CMakeLists.txt
index d35a72c..b6232ed 100644
--- a/Modules/FortranCInterface/CMakeLists.txt
+++ b/Modules/FortranCInterface/CMakeLists.txt
@@ -9,7 +9,7 @@
# See the License for more information.
#=
-cmake_minimum_required(VERSION 2.6.3)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(FortranCInterface C Fortran)
include(${FortranCInterface_BINARY_DIR}/Input.cmake OPTIONAL)
diff --git a/Modules/FortranCInterface/Verify/CMakeLists.txt
b/Modules/FortranCInterface/Verify/CMakeLists.txt
index e969f24..cde3c53 100644
--- a/Modules/FortranCInterface/Verify/CMakeLists.txt
+++ b/Modules/FortranCInterface/Verify/CMakeLists.txt
@@ -9,7 +9,7 @@
# See the License for more information.
#=
-cmake_minimum_required(VERSION 2.7)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(VerifyFortranC C Fortran)
option(VERIFY_CXX Whether to verify C++ and Fortran OFF)
diff --git a/Modules/IntelVSImplicitPath/CMakeLists.txt
b/Modules/IntelVSImplicitPath/CMakeLists.txt
index 96dc4e6..d115704 100644
--- a/Modules/IntelVSImplicitPath/CMakeLists.txt
+++ b/Modules/IntelVSImplicitPath/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(IntelFortranImplicit Fortran)
add_custom_command(
OUTPUT output.cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81a3f228824058849368f9c3a8e318c02fa03097
commit 81a3f228824058849368f9c3a8e318c02fa03097
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3182-g6f37091
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 6f370917e704c8aa61be4a88d3cad0eb93ca47fe (commit)
via 548ba5a0ede102d0b7b0e305dbd90d240d5ab218 (commit)
via 27dd68a2464c13e70bed197a3438855f56dec78c (commit)
from dbf3f614db5ffb5b510a7f321f20321e4fb2fbdf (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=6f370917e704c8aa61be4a88d3cad0eb93ca47fe
commit 6f370917e704c8aa61be4a88d3cad0eb93ca47fe
Merge: dbf3f61 548ba5a
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri May 16 11:57:42 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri May 16 11:57:42 2014 -0400
Merge topic 'preserve_cmake_minimum_required_version' into next
548ba5a0 Keep cmake_minimum_required calls in sync with current version
27dd68a2 Do not change minimum required version in modules
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=548ba5a0ede102d0b7b0e305dbd90d240d5ab218
commit 548ba5a0ede102d0b7b0e305dbd90d240d5ab218
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue May 13 11:02:19 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri May 16 12:17:43 2014 +0200
Keep cmake_minimum_required calls in sync with current version
Update cmake_minimum_required calls in CMakeLists.txt in Modules and in
CMakeLists.txt generated by other modules, so that they are always in
sync with current CMake version.
diff --git a/Modules/CheckLanguage.cmake b/Modules/CheckLanguage.cmake
index 3bd126a..99c809b 100644
--- a/Modules/CheckLanguage.cmake
+++ b/Modules/CheckLanguage.cmake
@@ -47,7 +47,7 @@ macro(check_language lang)
message(STATUS ${_desc})
file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang})
file(WRITE
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang}/CMakeLists.txt
- cmake_minimum_required(VERSION 2.8)
+ cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(Check${lang} ${lang})
file(WRITE \\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\
\set(CMAKE_${lang}_COMPILER ${CMAKE_${lang}_COMPILER}\\\)\\n\
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake
index 8b22ff7..5fa40a5 100644
--- a/Modules/FindSDL_sound.cmake
+++ b/Modules/FindSDL_sound.cmake
@@ -183,7 +183,7 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND
SDL_SOUND_LIBRARY)
# in the SDL_LIBRARY string after the -framework.
# But if I quote the stuff in INCLUDE_DIRECTORIES, it doesn't work.
file(WRITE ${PROJECT_BINARY_DIR}/CMakeTmp/CMakeLists.txt
- cmake_minimum_required(VERSION 2.8)
+ cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(DetermineSoundLibs)
include_directories(${SDL_INCLUDE_DIR} ${SDL_SOUND_INCLUDE_DIR})
add_executable(DetermineSoundLibs DetermineSoundLibs.c)
diff --git a/Modules/FortranCInterface/CMakeLists.txt
b/Modules/FortranCInterface/CMakeLists.txt
index d35a72c..b6232ed 100644
--- a/Modules/FortranCInterface/CMakeLists.txt
+++ b/Modules/FortranCInterface/CMakeLists.txt
@@ -9,7 +9,7 @@
# See the License for more information.
#=
-cmake_minimum_required(VERSION 2.6.3)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(FortranCInterface C Fortran)
include(${FortranCInterface_BINARY_DIR}/Input.cmake OPTIONAL)
diff --git a/Modules/FortranCInterface/Verify/CMakeLists.txt
b/Modules/FortranCInterface/Verify/CMakeLists.txt
index e969f24..cde3c53 100644
--- a/Modules/FortranCInterface/Verify/CMakeLists.txt
+++ b/Modules/FortranCInterface/Verify/CMakeLists.txt
@@ -9,7 +9,7 @@
# See the License for more information.
#=
-cmake_minimum_required(VERSION 2.7)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(VerifyFortranC C Fortran)
option(VERIFY_CXX Whether to verify C++ and Fortran OFF)
diff --git a/Modules/IntelVSImplicitPath/CMakeLists.txt
b/Modules/IntelVSImplicitPath/CMakeLists.txt
index 96dc4e6..d115704 100644
--- a/Modules/IntelVSImplicitPath/CMakeLists.txt
+++ b/Modules/IntelVSImplicitPath/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
project(IntelFortranImplicit Fortran)
add_custom_command(
OUTPUT output.cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27dd68a2464c13e70bed197a3438855f56dec78c
commit 27dd68a2464c13e70bed197a3438855f56dec78c
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2979-g273265f
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 273265f59786680ce6075114709c127cc9025d61 (commit) via 66731453dec57c08a02e3cd74cfadcc45c995739 (commit) from 7f7983fe7893e56caba4da49510f4620223bc5c4 (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=273265f59786680ce6075114709c127cc9025d61 commit 273265f59786680ce6075114709c127cc9025d61 Merge: 7f7983f 6673145 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Wed May 7 09:18:54 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed May 7 09:18:54 2014 -0400 Merge topic 'bug_0014849' into next 66731453 Allow to disable the Package Registry http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66731453dec57c08a02e3cd74cfadcc45c995739 commit 66731453dec57c08a02e3cd74cfadcc45c995739 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Wed Apr 2 16:32:54 2014 +0200 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Wed May 7 11:23:10 2014 +0200 Allow to disable the Package Registry Add 3 new variables: * CMAKE_EXPORT_NO_PACKAGE_REGISTRY that disables the export(PACKAGE) command * CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY that disables the User Package Registry in all the find_package calls. * CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY that disables the System Package Registry in all the find_package calls. Update documentation and unit tests. Fix Issue #14849 diff --git a/Help/command/export.rst b/Help/command/export.rst index 6b83587..d4bab35 100644 --- a/Help/command/export.rst +++ b/Help/command/export.rst @@ -51,4 +51,7 @@ projects find and use a package from the current project's build tree without help from the user. Note that the entry in the package registry that this command creates works only in conjunction with a package configuration file (nameConfig.cmake) that works with the -build tree. +build tree. In some cases, for example for packaging and for system +wide installations, it is not desirable to write the user package +registry. If the :variable:`CMAKE_EXPORT_NO_PACKAGE_REGISTRY` variable +is enabled, the ``export(PACKAGE)`` command will do nothing. diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 5d9aea6..190d05c 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -272,7 +272,9 @@ enabled. (This step is implemented only on Windows.) 6. Search paths stored in the CMake :ref:`User Package Registry`. - This can be skipped if ``NO_CMAKE_PACKAGE_REGISTRY`` is passed. + This can be skipped if ``NO_CMAKE_PACKAGE_REGISTRY`` is passed or by + setting the :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` + to ``TRUE``. See the :manual:`cmake-packages(7)` manual for details on the user package registry. @@ -285,7 +287,9 @@ enabled. CMAKE_SYSTEM_APPBUNDLE_PATH 8. Search paths stored in the CMake :ref:`System Package Registry`. - This can be skipped if ``NO_CMAKE_SYSTEM_PACKAGE_REGISTRY`` is passed. + This can be skipped if ``NO_CMAKE_SYSTEM_PACKAGE_REGISTRY`` is passed + or by setting the + :variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY` to ``TRUE``. See the :manual:`cmake-packages(7)` manual for details on the system package registry. diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index 1723826..c4cca6d 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -564,6 +564,21 @@ containing the package configuration file. There is no system package registry on non-Windows platforms. +.. _`Disabling the Package Registry`: + +Disabling the Package Registry +-- + +In some cases using the Package Registries is not desirable. CMake +allows to disable them using the following variables: + + * :variable:`CMAKE_EXPORT_NO_PACKAGE_REGISTRY` disables the + :command:`export(PACKAGE)` command. + * :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` disables the + User Package Registry in all the :command:`find_package` calls. + * :variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY` disables + the System Package Registry in all the :command:`find_package` calls. + Package Registry Example diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 82242f5..6cdccea 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -109,10 +109,13 @@ Variables
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2757-ge9f70ab
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 e9f70ab1dd5f7b6454a9c769a2f238581db47951 (commit)
via 93730bb3e05e7f9ced8bd0bc7810b8697e464cf4 (commit)
via 39ef80460213d666a5041bd416337c2e09e00283 (commit)
from da090ee84dbfb6397a4899a7c8d6bc006a79a613 (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=e9f70ab1dd5f7b6454a9c769a2f238581db47951
commit e9f70ab1dd5f7b6454a9c769a2f238581db47951
Merge: da090ee 93730bb
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon May 5 12:50:26 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 5 12:50:26 2014 -0400
Merge topic 'ExternalProject_labels' into next
93730bb3 ExternalProject: Set FOLDER property to targets
39ef8046 ExternalProject: Set LABELS property to targets
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93730bb3e05e7f9ced8bd0bc7810b8697e464cf4
commit 93730bb3e05e7f9ced8bd0bc7810b8697e464cf4
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Apr 29 11:41:12 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon May 5 18:49:41 2014 +0200
ExternalProject: Set FOLDER property to targets
This is useful when using the USE_FOLDERS global property
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index cf44f80..0d35cca 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1177,6 +1177,7 @@ function(ExternalProject_Add_StepTargets name)
add_custom_target(${name}-${step}
DEPENDS ${stamp_file})
set_property(TARGET ${name}-${step} PROPERTY LABELS ${name})
+set_property(TARGET ${name}-${step} PROPERTY FOLDER
ExternalProjectTargets/${name})
# Depend on other external projects (target-level).
get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
@@ -1920,6 +1921,8 @@ function(ExternalProject_Add name)
add_custom_target(${name} ALL DEPENDS ${complete_stamp_file})
set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1)
set_property(TARGET ${name} PROPERTY LABELS ${name})
+ set_property(TARGET ${name} PROPERTY FOLDER ExternalProjectTargets/${name})
+
_ep_parse_arguments(ExternalProject_Add ${name} _EP_ ${ARGN})
_ep_set_directories(${name})
_ep_get_step_stampfile(${name} done done_stamp_file)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39ef80460213d666a5041bd416337c2e09e00283
commit 39ef80460213d666a5041bd416337c2e09e00283
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Apr 7 15:42:44 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon May 5 18:49:41 2014 +0200
ExternalProject: Set LABELS property to targets
This is useful for using CDash subprojects.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index fc31ce4..cf44f80 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1176,6 +1176,7 @@ function(ExternalProject_Add_StepTargets name)
_ep_get_step_stampfile(${name} ${step} stamp_file)
add_custom_target(${name}-${step}
DEPENDS ${stamp_file})
+set_property(TARGET ${name}-${step} PROPERTY LABELS ${name})
# Depend on other external projects (target-level).
get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
@@ -1918,6 +1919,7 @@ function(ExternalProject_Add name)
# argument was passed, we explicitly set it for the target.
add_custom_target(${name} ALL DEPENDS ${complete_stamp_file})
set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1)
+ set_property(TARGET ${name} PROPERTY LABELS ${name})
_ep_parse_arguments(ExternalProject_Add ${name} _EP_ ${ARGN})
_ep_set_directories(${name})
_ep_get_step_stampfile(${name} done done_stamp_file)
---
Summary of changes:
Modules/ExternalProject.cmake |5 +
1 file changed, 5 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, next, updated. v3.0.0-rc3-2348-g2991b49
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 2991b499abe95138980effdef884452b6c702999 (commit) via ef9366b0bbb19639244a06ac34c8a8ecd35e66e8 (commit) from a0a5c4f067784fe9f21cc7d819366aa8c98bc884 (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=2991b499abe95138980effdef884452b6c702999 commit 2991b499abe95138980effdef884452b6c702999 Merge: a0a5c4f ef9366b Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Tue Apr 15 10:27:05 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Apr 15 10:27:05 2014 -0400 Merge topic 'FindGTK2_fix_bsd' into next ef9366b0 FindGTK2: Add /usr/X11R6/ to include paths http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef9366b0bbb19639244a06ac34c8a8ecd35e66e8 commit ef9366b0bbb19639244a06ac34c8a8ecd35e66e8 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Tue Apr 15 16:26:10 2014 +0200 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Tue Apr 15 16:26:13 2014 +0200 FindGTK2: Add /usr/X11R6/ to include paths Should fix builds on OpenBSD, see http://open.cdash.org/viewTest.php?onlyfailedbuildid=3286713 diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index a91da33..fecf929 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -267,6 +267,8 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) /usr/local/lib /usr/lib64 /usr/lib +/usr/X11R6/include +/usr/X11R6/lib /opt/gnome/include /opt/gnome/lib /opt/openwin/include --- Summary of changes: Modules/FindGTK2.cmake |2 ++ 1 file changed, 2 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, next, updated. v3.0.0-rc3-2353-g1057ecb
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 1057ecb6efe46cac903e36a1113657c8c0507e00 (commit)
via 13552d4cc19908d8bd3dc7430f2c8bff8f174811 (commit)
from dee43a8b6740cfc4a8e847ca20ff2bdf52515610 (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=1057ecb6efe46cac903e36a1113657c8c0507e00
commit 1057ecb6efe46cac903e36a1113657c8c0507e00
Merge: dee43a8 13552d4
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Tue Apr 15 11:16:15 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Apr 15 11:16:15 2014 -0400
Merge topic 'FindGTK2_fix_bsd' into next
13552d4c Add GTK2_FONTCONFIG_INCLUDE_DIR and GTK2_X11_INCLUDE_DIR to
optional includes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13552d4cc19908d8bd3dc7430f2c8bff8f174811
commit 13552d4cc19908d8bd3dc7430f2c8bff8f174811
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Apr 15 16:54:24 2014 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Apr 15 16:58:23 2014 +0200
Add GTK2_FONTCONFIG_INCLUDE_DIR and GTK2_X11_INCLUDE_DIR to 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
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1991-g7d40eac
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 7d40eac6a04576da54ac1e33fddae83aaa06007d (commit)
via 2dad1c143cfee60eadcf1bee5faa47efed89a31a (commit)
from caba6c67227283168f9a6eb3182278387841afda (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=7d40eac6a04576da54ac1e33fddae83aaa06007d
commit 7d40eac6a04576da54ac1e33fddae83aaa06007d
Merge: caba6c6 2dad1c1
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Sun Apr 6 19:19:03 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Apr 6 19:19:03 2014 -0400
Merge topic 'ExternalProject_VCS-quiet' into next
2dad1c14 ExternalProject: Find VCS packages quietly
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dad1c143cfee60eadcf1bee5faa47efed89a31a
commit 2dad1c143cfee60eadcf1bee5faa47efed89a31a
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Nov 18 12:24:24 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Apr 4 13:27:50 2014 +0200
ExternalProject: Find VCS packages quietly
This keeps the VCS packages out from FeatureSummary output, unless
the INCLUDE_QUIET_PACKAGES is used.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0f651e9..3ba91de 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1352,7 +1352,7 @@ function(_ep_add_download_command name)
if(cmd_set)
set(work_dir ${download_dir})
elseif(cvs_repository)
-find_package(CVS)
+find_package(CVS QUIET)
if(NOT CVS_EXECUTABLE)
message(FATAL_ERROR error: could not find cvs for checkout of ${name})
endif()
@@ -1379,7 +1379,7 @@ function(_ep_add_download_command name)
set(cmd ${CVS_EXECUTABLE} -d ${cvs_repository} -q co ${cvs_tag} -d
${src_name} ${cvs_module})
list(APPEND depends ${stamp_dir}/${name}-cvsinfo.txt)
elseif(svn_repository)
-find_package(Subversion)
+find_package(Subversion QUIET)
if(NOT Subversion_SVN_EXECUTABLE)
message(FATAL_ERROR error: could not find svn for checkout of ${name})
endif()
@@ -1415,7 +1415,7 @@ function(_ep_add_download_command name)
--non-interactive ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name})
list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
elseif(git_repository)
-find_package(Git)
+find_package(Git QUIET)
if(NOT GIT_EXECUTABLE)
message(FATAL_ERROR error: could not find git for clone of ${name})
endif()
@@ -1463,7 +1463,7 @@ function(_ep_add_download_command name)
set(cmd ${CMAKE_COMMAND} -P ${tmp_dir}/${name}-gitclone.cmake)
list(APPEND depends ${stamp_dir}/${name}-gitinfo.txt)
elseif(hg_repository)
-find_package(Hg)
+find_package(Hg QUIET)
if(NOT HG_EXECUTABLE)
message(FATAL_ERROR error: could not find hg for clone of ${name})
endif()
---
Summary of changes:
Modules/ExternalProject.cmake |8
1 file changed, 4 insertions(+), 4 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, next, updated. v3.0.0-rc3-1782-ga7052bc
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 a7052bc37ab6215e8be30074424027d087c1b07c (commit) via 841f432e965db72b22d72ff8c49b41d8318a4795 (commit) via 9f69a34f9990faefc28ac095fd874404cf07963b (commit) from c66e4b9ec013d21c4c96914d250ab538f3a59ae0 (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=a7052bc37ab6215e8be30074424027d087c1b07c commit a7052bc37ab6215e8be30074424027d087c1b07c Merge: c66e4b9 841f432 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Thu Apr 3 05:35:53 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Apr 3 05:35:53 2014 -0400 Merge topic 'cmMakefile_IsOn_fix_comment' into next 841f432e Fix cmMakefile::IsOn() comment 9f69a34f CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=841f432e965db72b22d72ff8c49b41d8318a4795 commit 841f432e965db72b22d72ff8c49b41d8318a4795 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Thu Apr 3 10:19:46 2014 +0200 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Thu Apr 3 10:19:46 2014 +0200 Fix cmMakefile::IsOn() comment diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 460a85c..ea4d34c 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -601,8 +601,11 @@ public: */ std::vectorstd::string GetDefinitions(int cacheonly=0) const; - /** Test a boolean cache entry to see if it is true or false, - * returns false if no entry defined. + /** + * Test a boolean variable to see if it is true or false. + * If the variable is not found in this makefile instance, the + * cache is then queried. + * Returns false if no entry defined. */ bool IsOn(const std::string name) const; bool IsSet(const std::string name) const; --- Summary of changes: Source/CMakeVersion.cmake |2 +- Source/cmMakefile.h |7 +-- 2 files changed, 6 insertions(+), 3 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, next, updated. v3.0.0-rc3-1728-gf83a50e
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 f83a50e31dd56adf22d749edc5580df060afdf90 (commit)
via 1ddcc582c1a408e054efdcc32c00a8c07299d115 (commit)
via 0a1c0129617af6cbcc44a7f66fdb126603861e81 (commit)
from b69bd9e8a6a0508b3fc108bc0335cd345099d7e4 (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=f83a50e31dd56adf22d749edc5580df060afdf90
commit f83a50e31dd56adf22d749edc5580df060afdf90
Merge: b69bd9e 1ddcc58
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Tue Apr 1 12:18:26 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Apr 1 12:18:26 2014 -0400
Merge topic 'ExternalProject_exclude-from-all' into next
1ddcc582 ExternalProject: Add EXCLUDE_FROM_ALL option to ExternalProject_Add
0a1c0129 ExternalProject: Add EXCLUDE_FROM_MAIN option to
ExternalProject_Add_Step
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ddcc582c1a408e054efdcc32c00a8c07299d115
commit 1ddcc582c1a408e054efdcc32c00a8c07299d115
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Dec 6 17:09:27 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Apr 1 18:17:31 2014 +0200
ExternalProject: Add EXCLUDE_FROM_ALL option to ExternalProject_Add
When adding a new external project, the all target will depend on
this.
This option allows one to add an external project will not be executed
when the all target is executed.
The reason for this is that an external project could be useful, for
example, only for running tests, and therefore not necessary during
the build.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 3c86331..0f651e9 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -16,6 +16,7 @@
#[LIST_SEPARATOR sep]# Sep to be replaced by ; in cmd lines
#[TMP_DIR dir] # Directory to store temporary files
#[STAMP_DIR dir] # Directory to store step timestamps
+#[EXCLUDE_FROM_ALL 1]# The all target does not depend on this
# #--Download step--
#[DOWNLOAD_NAME fname] # File name to store (if not end of URL)
#[DOWNLOAD_DIR dir] # Directory to store downloaded files
@@ -1913,6 +1914,9 @@ function(ExternalProject_Add name)
set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
set(complete_stamp_file ${cmf_dir}${cfgdir}/${name}-complete)
+ # The ALL option to add_custom_target just tells it to not set the
+ # EXCLUDE_FROM_ALL target property. Later, if the EXCLUDE_FROM_ALL
+ # argument was passed, we explicitly set it for the target.
add_custom_target(${name} ALL DEPENDS ${complete_stamp_file})
set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1)
_ep_parse_arguments(ExternalProject_Add ${name} _EP_ ${ARGN})
@@ -1920,6 +1924,12 @@ function(ExternalProject_Add name)
_ep_get_step_stampfile(${name} done done_stamp_file)
_ep_get_step_stampfile(${name} install install_stamp_file)
+ # Set the EXCLUDE_FROM_ALL target property if required.
+ get_property(exclude_from_all TARGET ${name} PROPERTY _EP_EXCLUDE_FROM_ALL)
+ if(exclude_from_all)
+set_property(TARGET ${name} PROPERTY EXCLUDE_FROM_ALL TRUE)
+ endif()
+
# The 'complete' step depends on all other steps and creates a
# 'done' mark. A dependent external project's 'configure' step
# depends on the 'done' mark so that it rebuilds when this project
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a1c0129617af6cbcc44a7f66fdb126603861e81
commit 0a1c0129617af6cbcc44a7f66fdb126603861e81
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Dec 4 10:05:50 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Apr 1 18:17:31 2014 +0200
ExternalProject: Add EXCLUDE_FROM_MAIN option to ExternalProject_Add_Step
When adding a new step using ExternalProject_Add_Step, the main target
will depend on this step.
This option allows one to add a step that will not be executed when the
main target for the external project is executed.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index e490e69..3c86331 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -119,6 +119,7 @@
#[DEPENDERS steps...]# Steps that depend on this step
#[DEPENDS files...] # Files on which this step depends
#[ALWAYS 1] # No stamp file, step always runs
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1493-gcbd2444
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 cbd2444b399f30af625b57ca3c1b1a26ac5ec020 (commit)
via 64d78bd6ac14c6067dfc2a9a8d572b662364d55f (commit)
via 49bed21adc6c78067af3768fb18a2e04e9ce12bf (commit)
from f376a82b9fc79ff961b35c753c2b2beef546be7e (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=cbd2444b399f30af625b57ca3c1b1a26ac5ec020
commit cbd2444b399f30af625b57ca3c1b1a26ac5ec020
Merge: f376a82 64d78bd
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Mar 27 11:48:47 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 27 11:48:47 2014 -0400
Merge topic 'ExternalProject_GitUpdate' into next
64d78bd6 ExternalProject: Better handling of git remote branches
49bed21a ExternalProject: Strip trailing space from git hash
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64d78bd6ac14c6067dfc2a9a8d572b662364d55f
commit 64d78bd6ac14c6067dfc2a9a8d572b662364d55f
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Nov 18 11:36:18 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Mar 27 15:59:22 2014 +0100
ExternalProject: Better handling of git remote branches
ExternalProject handles git remote branches by commit hash. Due to
this, the git repository ends in detached states, and local commits
are discarded.
This patch uses git pull --rebase for remote branches instead of
git checkout. If there are local changes, git stash is used to save
the changes and restore them after the pull. If any of these operation
fails, it tries to restore the original status and exits with a fatal
error, asking the user to resolve the conflicts manually.
This also makes the behaviour of ExternalProject using git more similar
to the svn version, and probably more likely to what the user expects
by setting GIT_TAG to a branch.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index e56cc37..bbf2193 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -494,13 +494,94 @@ if(error_code OR is_remote_ref OR NOT (\\${tag_sha}\
STREQUAL \\${head_sha}\
message(FATAL_ERROR \Failed to fetch repository '${git_repository}'\)
endif()
- execute_process(
-COMMAND \${git_EXECUTABLE}\ checkout ${git_tag}
-WORKING_DIRECTORY \${work_dir}\
-RESULT_VARIABLE error_code
-)
- if(error_code)
-message(FATAL_ERROR \Failed to checkout tag: '${git_tag}'\)
+ if(is_remote_ref)
+# Check if stash is needed
+execute_process(
+ COMMAND \${git_EXECUTABLE}\ status --porcelain
+ WORKING_DIRECTORY \${work_dir}\
+ RESULT_VARIABLE error_code
+ OUTPUT_VARIABLE repo_status
+ )
+if(error_code)
+ message(FATAL_ERROR \Failed to get the status\)
+endif()
+string(LENGTH \\${repo_status}\ need_stash)
+
+# If not in clean state, stash changes in order to be able to be able to
+# perform git pull --rebase
+if(need_stash)
+ execute_process(
+COMMAND \${git_EXECUTABLE}\ stash --all --quiet
+WORKING_DIRECTORY \${work_dir}\
+RESULT_VARIABLE error_code
+)
+ if(error_code)
+message(FATAL_ERROR \Failed to stash changes\)
+ endif()
+endif()
+
+# Pull changes from the remote branch
+execute_process(
+ COMMAND \${git_EXECUTABLE}\ pull --rebase origin ${git_tag}
+ WORKING_DIRECTORY \${work_dir}\
+ RESULT_VARIABLE error_code
+ )
+if(error_code)
+ # Rebase failed: Restore previous state.
+ execute_process(
+COMMAND \${git_EXECUTABLE}\ rebase --abort
+WORKING_DIRECTORY \${work_dir}\
+ )
+ if(need_stash)
+execute_process(
+ COMMAND \${git_EXECUTABLE}\ stash pop --index --quiet
+ WORKING_DIRECTORY \${work_dir}\
+ )
+ endif()
+ message(FATAL_ERROR \\\nFailed to rebase in:
'${work_dir}/${src_name}'.\\nYou will have to resolve the conflicts manually\)
+endif()
+
+if(need_stash)
+ execute_process(
+COMMAND \${git_EXECUTABLE}\ stash pop --index --quiet
+WORKING_DIRECTORY \${work_dir}\
+RESULT_VARIABLE error_code
+)
+ if(error_code)
+# Stash pop --index failed: Try again dropping the index
+execute_process(
+ COMMAND \${git_EXECUTABLE}\ reset --hard --quiet
+ WORKING_DIRECTORY \${work_dir}\
+ RESULT_VARIABLE error_code
+ )
+execute_process
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1502-g4c0b1e3
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 4c0b1e3de0974769e7a90ae2bb8f66e9802af8d1 (commit)
via 40bf640cec545d4cbc4728b6fae78525ebd66368 (commit)
via 7cec58399d935a1aa30d6120640e90b951fcc686 (commit)
from 2d1fa0bccae394270e3cc70edb2c747728f166b0 (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=4c0b1e3de0974769e7a90ae2bb8f66e9802af8d1
commit 4c0b1e3de0974769e7a90ae2bb8f66e9802af8d1
Merge: 2d1fa0b 40bf640
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Mar 27 15:39:53 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 27 15:39:53 2014 -0400
Merge topic 'ExternalProject_GitUpdate' into next
40bf640c ExternalProject: Strip out origin/ from git tag
7cec5839 ExternalProject: Use git stash save instead of git stash
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40bf640cec545d4cbc4728b6fae78525ebd66368
commit 40bf640cec545d4cbc4728b6fae78525ebd66368
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Mar 27 20:35:23 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Mar 27 20:38:35 2014 +0100
ExternalProject: Strip out origin/ from git tag
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7d4aa16..83ddafd 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -293,6 +293,9 @@ define_property(DIRECTORY PROPERTY EP_STEP_TARGETS
INHERITED
function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE
git_repository git_tag git_submodules src_name work_dir gitclone_infofile
gitclone_stampfile)
+ if(${git_tag} MATCHES ^origin/(.+)$)
+set(git_tag ${CMAKE_MATCH_1})
+ endif()
file(WRITE ${script_filename}
if(\${git_tag}\ STREQUAL \\)
message(FATAL_ERROR \Tag for git checkout should not be empty.\)
@@ -444,6 +447,9 @@ endfunction()
function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag
git_submodules git_repository work_dir)
+ if(${git_tag} MATCHES ^origin/(.+)$)
+set(git_tag ${CMAKE_MATCH_1})
+ endif()
file(WRITE ${script_filename}
if(\${git_tag}\ STREQUAL \\)
message(FATAL_ERROR \Tag for git checkout should not be empty.\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cec58399d935a1aa30d6120640e90b951fcc686
commit 7cec58399d935a1aa30d6120640e90b951fcc686
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Mar 27 19:53:42 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Mar 27 19:53:42 2014 +0100
ExternalProject: Use git stash save instead of git stash
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index bbf2193..7d4aa16 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -511,7 +511,7 @@ if(error_code OR is_remote_ref OR NOT (\\${tag_sha}\
STREQUAL \\${head_sha}\
# perform git pull --rebase
if(need_stash)
execute_process(
-COMMAND \${git_EXECUTABLE}\ stash --all --quiet
+COMMAND \${git_EXECUTABLE}\ stash save --all --quiet
WORKING_DIRECTORY \${work_dir}\
RESULT_VARIABLE error_code
)
---
Summary of changes:
Modules/ExternalProject.cmake |8 +++-
1 file changed, 7 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, next, updated. v3.0.0-rc3-1548-g372f343
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 372f343688f89c3610c78cacd46b4a19cc48e566 (commit)
via 2cc64ce62e731ad0d0de9655f10e5a3ee3137fcc (commit)
via c5ebe5753f4768b68be9ce6cf8452b96b0299cf1 (commit)
via bef58048fbc1048a2f2f564503b7546eaa2660c8 (commit)
from 2b12371dd2f86b5a26e527362e6031e00f7ee772 (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=372f343688f89c3610c78cacd46b4a19cc48e566
commit 372f343688f89c3610c78cacd46b4a19cc48e566
Merge: 2b12371 2cc64ce
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Mar 27 18:39:26 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Mar 27 18:39:26 2014 -0400
Merge topic 'ExternalProject_GitUpdate' into next
2cc64ce6 ExternalProject: rebase instead of pull --rebase
c5ebe575 ExternalProject: Allow tags in the form remote/tag
bef58048 Revert ExternalProject: Strip out origin/ from git tag
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cc64ce62e731ad0d0de9655f10e5a3ee3137fcc
commit 2cc64ce62e731ad0d0de9655f10e5a3ee3137fcc
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Mar 27 23:38:08 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Mar 27 23:38:16 2014 +0100
ExternalProject: rebase instead of pull --rebase
Since fetch was executed a few lines before, it is not necessary to
contact the remote repository again.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 3962c16..e490e69 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -533,7 +533,7 @@ if(error_code OR is_remote_ref OR NOT (\\${tag_sha}\
STREQUAL \\${head_sha}\
# Pull changes from the remote branch
execute_process(
- COMMAND \${git_EXECUTABLE}\ pull --rebase \${git_remote} \${git_tag}
+ COMMAND \${git_EXECUTABLE}\ rebase \${git_remote}/\${git_tag}
WORKING_DIRECTORY \${work_dir}\
RESULT_VARIABLE error_code
)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5ebe5753f4768b68be9ce6cf8452b96b0299cf1
commit c5ebe5753f4768b68be9ce6cf8452b96b0299cf1
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Mar 27 23:17:44 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Mar 27 23:31:12 2014 +0100
ExternalProject: Allow tags in the form remote/tag
If tag is in the form remote/tag (i.e. origin/master) they are
split and used for the pull.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7d4aa16..3962c16 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -473,6 +473,17 @@ else()
set(is_remote_ref 0)
endif()
+# Tag is in the form remote/tag (i.e. origin/master) we must strip
+# the remote from the tag.
+if(\\${show_ref_output}\ MATCHES \refs/remotes/${git_tag}\)
+ string(REGEX MATCH \^([^/]+)/(.+)$\ _unused \${git_tag}\)
+ set(git_remote \\${CMAKE_MATCH_1}\)
+ set(git_tag \\${CMAKE_MATCH_2}\)
+else()
+ set(git_remote \origin\)
+ set(git_tag \${git_tag}\)
+endif()
+
# This will fail if the tag does not exist (it probably has not been fetched
# yet).
execute_process(
@@ -522,7 +533,7 @@ if(error_code OR is_remote_ref OR NOT (\\${tag_sha}\
STREQUAL \\${head_sha}\
# Pull changes from the remote branch
execute_process(
- COMMAND \${git_EXECUTABLE}\ pull --rebase origin ${git_tag}
+ COMMAND \${git_EXECUTABLE}\ pull --rebase \${git_remote} \${git_tag}
WORKING_DIRECTORY \${work_dir}\
RESULT_VARIABLE error_code
)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bef58048fbc1048a2f2f564503b7546eaa2660c8
commit bef58048fbc1048a2f2f564503b7546eaa2660c8
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Mar 27 23:31:00 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Mar 27 23:31:11 2014 +0100
Revert ExternalProject: Strip out origin/ from git tag
This reverts commit 40bf640cec545d4cbc4728b6fae78525ebd66368.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 83ddafd..7d4aa16 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -293,9 +293,6 @@ define_property(DIRECTORY PROPERTY EP_STEP_TARGETS
INHERITED
function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE
git_repository git_tag git_submodules src_name work_dir gitclone_infofile
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1142-g8fb0e30
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 8fb0e3092c8d84748a3a5414aa0a9c3915ba828a (commit) via 7f857775e212436dbca623a4bfe37a20c6c98e0a (commit) from 71133a88a9a5373a13c5b2bb3898c3757606bb70 (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=8fb0e3092c8d84748a3a5414aa0a9c3915ba828a commit 8fb0e3092c8d84748a3a5414aa0a9c3915ba828a Merge: 71133a8 7f85777 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Mon Mar 17 12:36:47 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Mar 17 12:36:47 2014 -0400 Merge topic 'CheckTypeSize_#14056' into next 7f857775 CheckTypeSize: Add unit test to cover the no-C case http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f857775e212436dbca623a4bfe37a20c6c98e0a commit 7f857775e212436dbca623a4bfe37a20c6c98e0a Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Mon Mar 17 17:36:14 2014 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Mon Mar 17 17:36:14 2014 +0100 CheckTypeSize: Add unit test to cover the no-C case diff --git a/Tests/RunCMake/CheckModules/CheckTypeSizeOkNoC.cmake b/Tests/RunCMake/CheckModules/CheckTypeSizeOkNoC.cmake new file mode 100644 index 000..b2dcd7f --- /dev/null +++ b/Tests/RunCMake/CheckModules/CheckTypeSizeOkNoC.cmake @@ -0,0 +1,4 @@ +enable_language(CXX) +include(CheckTypeSize) +check_type_size(int SIZEOF_INT LANGUAGE CXX) +check_type_size(int SIZEOF_INT BUILTIN_TYPES_ONLY LANGUAGE CXX) diff --git a/Tests/RunCMake/CheckModules/RunCMakeTest.cmake b/Tests/RunCMake/CheckModules/RunCMakeTest.cmake index fda7ebf..5b4e57e 100644 --- a/Tests/RunCMake/CheckModules/RunCMakeTest.cmake +++ b/Tests/RunCMake/CheckModules/RunCMakeTest.cmake @@ -12,3 +12,5 @@ run_cmake(CheckTypeSizeUnknownLanguage) run_cmake(CheckTypeSizeMissingLanguage) run_cmake(CheckTypeSizeUnknownArgument) run_cmake(CheckTypeSizeMixedArgs) + +run_cmake(CheckTypeSizeOkNoC) --- Summary of changes: Tests/RunCMake/CheckModules/CheckTypeSizeOkNoC.cmake |4 Tests/RunCMake/CheckModules/RunCMakeTest.cmake |2 ++ 2 files changed, 6 insertions(+) create mode 100644 Tests/RunCMake/CheckModules/CheckTypeSizeOkNoC.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-rc1-1147-g50444d6
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 50444d66497cbfed37b915fbd8547b177aea9928 (commit)
via cc5a0d8f42f9ad8bc5ac50be343db05128a0c6ea (commit)
via 453d2b2438a1c9e8a21e89addf446f5bec3a4000 (commit)
from 2e3c7199d5126b075dfde177fb9578d814dcff16 (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=50444d66497cbfed37b915fbd8547b177aea9928
commit 50444d66497cbfed37b915fbd8547b177aea9928
Merge: 2e3c719 cc5a0d8
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Mar 17 13:15:12 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Mar 17 13:15:12 2014 -0400
Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH_2' into next
cc5a0d8f FindPkgConfig: More unit tests
453d2b24 FindPkgConfig: small refactoring
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc5a0d8f42f9ad8bc5ac50be343db05128a0c6ea
commit cc5a0d8f42f9ad8bc5ac50be343db05128a0c6ea
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Mar 17 18:09:54 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Mar 17 18:10:59 2014 +0100
FindPkgConfig: More unit tests
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
new file mode 100644
index 000..924976e
--- /dev/null
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_NO_PKGCONFIG_PATH.cmake
@@ -0,0 +1,41 @@
+# Needed for CMAKE_SYSTEM_NAME, CMAKE_LIBRARY_ARCHITECTURE and
FIND_LIBRARY_USE_LIB64_PATHS
+enable_language(C)
+
+# Prepare environment and variables
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH FALSE)
+set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/pc-foo)
+if(WIN32)
+set(PKG_CONFIG_EXECUTABLE
${CMAKE_CURRENT_SOURCE_DIR}\\dummy-pkg-config.bat)
+set(ENV{CMAKE_PREFIX_PATH}
${CMAKE_CURRENT_SOURCE_DIR}\\pc-bar;X:\\this\\directory\\should\\not\\exist\\in\\the\\filesystem)
+set(ENV{PKG_CONFIG_PATH} C:\\baz)
+else()
+set(PKG_CONFIG_EXECUTABLE
${CMAKE_CURRENT_SOURCE_DIR}/dummy-pkg-config.sh)
+set(ENV{CMAKE_PREFIX_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/pc-bar:/this/directory/should/not/exist/in/the/filesystem)
+set(ENV{PKG_CONFIG_PATH} /baz)
+endif()
+
+
+find_package(PkgConfig)
+
+if(WIN32)
+ set(expected_path C:\\baz)
+else()
+ set(expected_path /baz)
+endif()
+
+
+pkg_check_modules(FOO ${expected_path})
+
+if(NOT FOO_FOUND)
+ message(FATAL_ERROR Expected PKG_CONFIG_PATH: \${expected_path}\.)
+endif()
+
+
+
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
+
+pkg_check_modules(BAR ${expected_path} NO_CMAKE_PATH
NO_CMAKE_ENVIRONMENT_PATH)
+
+if(NOT BAR_FOUND)
+ message(FATAL_ERROR Expected PKG_CONFIG_PATH: \${expected_path}\.)
+endif()
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
index 5f9913f..4a66e85 100644
--- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
@@ -44,7 +44,7 @@ else()
endif()
-pkg_check_modules (FOO ${expected_path})
+pkg_check_modules(FOO ${expected_path})
if(NOT FOO_FOUND)
message(FATAL_ERROR Expected PKG_CONFIG_PATH: \${expected_path}\.)
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
similarity index 79%
copy from Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
copy to
Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
index 5f9913f..0b057b8 100644
--- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
+++
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH_NO_CMAKE_ENVIRONMENT_PATH.cmake
@@ -24,27 +24,27 @@ if(NOT DEFINED CMAKE_SYSTEM_NAME
if(EXISTS /etc/debian_version) # is this a debian system ?
if(CMAKE_LIBRARY_ARCHITECTURE MATCHES
^(i386-linux-gnu|x86_64-linux-gnu)$)
# Cannot create directories for all the existing architectures...
- set(expected_path
/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-bar/lib/pkgconfig)
+ set(expected_path
/baz:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig:${CMAKE_CURRENT_SOURCE_DIR}/pc-foo/lib/pkgconfig)
else()
- set
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1092-g949ca37
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 949ca3769c349da689f5652af81b6bbd41209a1d (commit)
via 7d6d45f23c25355f1da0ad9fcd9e45cdb05194f8 (commit)
via 3c6943eb9da3695316b807f59ba42a1b105a7afb (commit)
from 4c7860ef1a6f664545ae1ecfc86b978ecd299734 (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=949ca3769c349da689f5652af81b6bbd41209a1d
commit 949ca3769c349da689f5652af81b6bbd41209a1d
Merge: 4c7860e 7d6d45f
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Sat Mar 15 18:25:34 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Mar 15 18:25:34 2014 -0400
Merge topic 'CheckTypeSize_#14056' into next
7d6d45f2 CheckTypeSize: Support for CXX when C language is not enabled
3c6943eb CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d6d45f23c25355f1da0ad9fcd9e45cdb05194f8
commit 7d6d45f23c25355f1da0ad9fcd9e45cdb05194f8
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Sat Mar 15 22:56:47 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Sat Mar 15 23:23:53 2014 +0100
CheckTypeSize: Support for CXX when C language is not enabled
This example now works without need to enable C language:
cmake_minimum_required(VERSION x.x.x)
project(foo CXX)
include(CheckTypeSize)
check_type_size(short SIZEOF_SHORT LANGUAGE CXX)
Fixes #14056
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index ec28d8b..333b325 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -75,6 +75,7 @@
# License text for the above reference.)
include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
cmake_policy(PUSH)
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
@@ -218,9 +219,15 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
set(_builtin 0)
else()
set(_builtin 1)
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(stdint.h HAVE_STDINT_H)
-check_include_file(stddef.h HAVE_STDDEF_H)
+if(${_language} STREQUAL C)
+ check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_file(stdint.h HAVE_STDINT_H)
+ check_include_file(stddef.h HAVE_STDDEF_H)
+elseif(${_language} STREQUAL CXX)
+ check_include_file_cxx(sys/types.h HAVE_SYS_TYPES_H)
+ check_include_file_cxx(stdint.h HAVE_STDINT_H)
+ check_include_file_cxx(stddef.h HAVE_STDDEF_H)
+endif()
endif()
unset(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
unset(_CHECK_TYPE_SIZE_LANGUAGE)
---
Summary of changes:
Modules/CheckTypeSize.cmake | 13 ++---
Source/CMakeVersion.cmake |2 +-
2 files changed, 11 insertions(+), 4 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, next, updated. v3.0.0-rc1-1018-g03ce61a
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 03ce61a5017fb475019b778146c9bc9d107114a7 (commit) via 1af77f3f1dcd2fe160a9ea1d7936742c968f25d1 (commit) from 3aafa45107d37d75ef969877158367479a268fed (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=03ce61a5017fb475019b778146c9bc9d107114a7 commit 03ce61a5017fb475019b778146c9bc9d107114a7 Merge: 3aafa45 1af77f3 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Fri Mar 14 06:52:24 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Mar 14 06:52:24 2014 -0400 Merge topic 'FeatureSummary_missing_titles' into next 1af77f3f FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1af77f3f1dcd2fe160a9ea1d7936742c968f25d1 commit 1af77f3f1dcd2fe160a9ea1d7936742c968f25d1 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Fri Mar 14 11:51:45 2014 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Fri Mar 14 11:51:51 2014 +0100 FeatureSummary: Add missing titles for PACKAGES_FOUND and PACKAGES_NOT_FOUND Since now these can be used with the WHAT argument a title is required. diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 6696515..a72954c 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -492,6 +492,8 @@ function(FEATURE_SUMMARY) set(title_ENABLED_FEATURES The following features have been enabled:) set(title_DISABLED_FEATURES The following features have been disabled:) +set(title_PACKAGES_FOUND The following packages have been found:) +set(title_PACKAGES_NOT_FOUND The following packages have not been found:) set(title_OPTIONAL_PACKAGES_FOUNDThe following OPTIONAL packages have been found:) set(title_OPTIONAL_PACKAGES_NOT_FOUNDThe following OPTIONAL packages have not been found:) set(title_RECOMMENDED_PACKAGES_FOUND The following RECOMMENDED packages have been found:) --- Summary of changes: Modules/FeatureSummary.cmake |2 ++ 1 file changed, 2 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, next, updated. v3.0.0-rc1-1022-gc126b8c
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 c126b8c14505282cc22af4b719b58114f78c83f7 (commit)
via 7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c (commit)
via 17f471d01bc5cf92be93c1e03241fbb9d1bd8d77 (commit)
via f92203ba4955878f4fdb969c2078a91f7f9c2dac (commit)
from 03ce61a5017fb475019b778146c9bc9d107114a7 (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=c126b8c14505282cc22af4b719b58114f78c83f7
commit c126b8c14505282cc22af4b719b58114f78c83f7
Merge: 03ce61a 7ccae4d
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri Mar 14 07:15:13 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Mar 14 07:15:13 2014 -0400
Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH' into next
7ccae4dd FindPkgConfig - Unit tests: Add quotes when setting
CMAKE_PREFIX_PATH
17f471d0 FindPkgConfig - Unit tests: Fix dummy pkg-config scripts
f92203ba FindPkgConfig: Fix TO_NATIVE_PATH escaping white spaces
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c
commit 7ccae4dd5c9f859845871ce43d4f33f46d2f3e7c
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Mar 14 12:12:13 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Mar 14 12:14:37 2014 +0100
FindPkgConfig - Unit tests: Add quotes when setting CMAKE_PREFIX_PATH
This should fix when CMAKE_CURRENT_SOURCE_DIR contains a white space
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
index e218247..5f9913f 100644
--- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
+++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_PKGCONFIG_PATH.cmake
@@ -3,7 +3,7 @@ enable_language(C)
# Prepare environment and variables
set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/pc-foo)
+set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/pc-foo)
if(WIN32)
set(PKG_CONFIG_EXECUTABLE
${CMAKE_CURRENT_SOURCE_DIR}\\dummy-pkg-config.bat)
set(ENV{CMAKE_PREFIX_PATH}
${CMAKE_CURRENT_SOURCE_DIR}\\pc-bar;X:\\this\\directory\\should\\not\\exist\\in\\the\\filesystem)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17f471d01bc5cf92be93c1e03241fbb9d1bd8d77
commit 17f471d01bc5cf92be93c1e03241fbb9d1bd8d77
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Mar 14 12:04:25 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Mar 14 12:14:27 2014 +0100
FindPkgConfig - Unit tests: Fix dummy pkg-config scripts
diff --git a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
index f068897..b2096ed 100755
--- a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
+++ b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.bat
@@ -8,7 +8,8 @@ IF %1==--version (
)
IF %1==--exists (
- IF NOT %2==%PKG_CONFIG_PATH% (
+ SHIFT
+ IF NOT %*==%PKG_CONFIG_PATH% (
EXIT /B 1
)
)
diff --git a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
index e0e6a54..e62bb74 100755
--- a/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
+++ b/Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh
@@ -9,7 +9,10 @@ case $1 in
echo 0.0-cmake-dummy
;;
--exists)
-[ $2 = ${PKG_CONFIG_PATH} ] || exit 1
+shift
+echo $@
+echo ${PKG_CONFIG_PATH}
+[ $@ = ${PKG_CONFIG_PATH} ] || exit 1
;;
*)
exit 255
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f92203ba4955878f4fdb969c2078a91f7f9c2dac
commit f92203ba4955878f4fdb969c2078a91f7f9c2dac
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Mar 14 12:05:55 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Mar 14 12:14:17 2014 +0100
FindPkgConfig: Fix TO_NATIVE_PATH escaping white spaces
White spaces in the environment variables should not be escaped
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index fee45b6..812bb92 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -255,6 +255,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
file(TO_NATIVE_PATH ${_pkgconfig_path} _pkgconfig_path)
if(UNIX)
string(REPLACE ; : _pkgconfig_path ${_pkgconfig_path})
+ string(REPLACE \\_pkgconfig_path ${_pkgconfig_path
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-845-g7b5da68
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 7b5da6892d5b716c5382295d416232af3c1ba2c3 (commit)
via 1c4cfca4270eea1be95f57935e9df72e4e3f8b88 (commit)
via 16ce9a786c8552aaaebe8ab25427b1d916cd6c05 (commit)
from 45b6ef2741674d9f8ff10d6e57a11c511804ad21 (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=7b5da6892d5b716c5382295d416232af3c1ba2c3
commit 7b5da6892d5b716c5382295d416232af3c1ba2c3
Merge: 45b6ef2 1c4cfca
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Tue Mar 11 10:37:51 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 11 10:37:51 2014 -0400
Merge topic 'FindPkgConfig_Extend-PKG_CONFIG_PATH' into next
1c4cfca4 FindPkgConfig: Remove empty values from the list
16ce9a78 FindPkgConfig: Remove unneeded string replacement
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c4cfca4270eea1be95f57935e9df72e4e3f8b88
commit 1c4cfca4270eea1be95f57935e9df72e4e3f8b88
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Mar 11 15:37:18 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Mar 11 15:37:18 2014 +0100
FindPkgConfig: Remove empty values from the list
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index fcb1c08..fee45b6 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -250,6 +250,8 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
# Prepare and set the environment variable
if(NOT ${_pkgconfig_path} STREQUAL )
+# remove empty values from the list
+list(REMOVE_ITEM _pkgconfig_path )
file(TO_NATIVE_PATH ${_pkgconfig_path} _pkgconfig_path)
if(UNIX)
string(REPLACE ; : _pkgconfig_path ${_pkgconfig_path})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16ce9a786c8552aaaebe8ab25427b1d916cd6c05
commit 16ce9a786c8552aaaebe8ab25427b1d916cd6c05
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Mar 11 15:36:50 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Mar 11 15:36:50 2014 +0100
FindPkgConfig: Remove unneeded string replacement
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index aacdc8f..fcb1c08 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -193,25 +193,16 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
if(NOT _no_cmake_environment_path)
if(NOT $ENV{CMAKE_PREFIX_PATH} STREQUAL )
file(TO_CMAKE_PATH $ENV{CMAKE_PREFIX_PATH} _path)
-if(UNIX)
- string(REPLACE \\: ; _path ${_path})
-endif()
list(APPEND _extra_paths ${_path})
unset(_path)
endif()
if(NOT $ENV{CMAKE_FRAMEWORK_PATH} STREQUAL )
file(TO_CMAKE_PATH $ENV{CMAKE_FRAMEWORK_PATH} _path)
-if(UNIX)
- string(REPLACE \\: ; _path ${_path})
-endif()
list(APPEND _extra_paths ${_path})
unset(_path)
endif()
if(NOT $ENV{CMAKE_APPBUNDLE_PATH} STREQUAL )
file(TO_CMAKE_PATH $ENV{CMAKE_APPBUNDLE_PATH} _path)
-if(UNIX)
- string(REPLACE \\: ; _path ${_path})
-endif()
list(APPEND _extra_paths ${_path})
unset(_path)
endif()
---
Summary of changes:
Modules/FindPkgConfig.cmake | 11 ++-
1 file changed, 2 insertions(+), 9 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, next, updated. v3.0.0-rc1-501-g5926b00
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 5926b000386466034dc84430d1801c7154a8d4a2 (commit)
via 8372b4553bc58c00ad3ef923919ff5547746b95e (commit)
via d348cd1bc50b74786d3e350a3b29aa92eeca1339 (commit)
from 4931e3ce96b9d0b8f89dd71b7a80d4fa15cad156 (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=5926b000386466034dc84430d1801c7154a8d4a2
commit 5926b000386466034dc84430d1801c7154a8d4a2
Merge: 4931e3c 8372b45
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Tue Mar 4 16:53:46 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 4 16:53:46 2014 -0500
Merge topic 'FeatureSummary_combine_WHAT_values' into next
8372b455 FeatureSummary: Add unit tests
d348cd1b FeatureSummary: Allow to combine and reorder values for the WHAT
option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8372b4553bc58c00ad3ef923919ff5547746b95e
commit 8372b4553bc58c00ad3ef923919ff5547746b95e
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Mar 3 19:51:57 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Mar 3 19:52:13 2014 +0100
FeatureSummary: Add unit tests
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 9bb097b..c043e57 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -42,6 +42,7 @@ add_RunCMake_test(CompilerNotFound)
add_RunCMake_test(Configure)
add_RunCMake_test(DisallowedCommands)
add_RunCMake_test(ExternalData)
+add_RunCMake_test(FeatureSummary)
add_RunCMake_test(FPHSA)
add_RunCMake_test(GeneratorExpression)
add_RunCMake_test(GeneratorToolset)
diff --git a/Tests/RunCMake/FeatureSummary/CMakeLists.txt
b/Tests/RunCMake/FeatureSummary/CMakeLists.txt
new file mode 100644
index 000..72abfc8
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.11)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll-stdout.txt
b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll-stdout.txt
new file mode 100644
index 000..9a3f023
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll-stdout.txt
@@ -0,0 +1,7 @@
+-- The following features have been enabled:
+
+ \* Foo , Foo\.
+
+-- The following features have been disabled:
+
+ \* Bar , Bar\.
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll.cmake
b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll.cmake
new file mode 100644
index 000..ec5ebcb
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll.cmake
@@ -0,0 +1,9 @@
+include(FeatureSummary)
+
+set(WITH_FOO 1)
+set(WITH_BAR 0)
+
+add_feature_info(Foo WITH_FOO Foo.)
+add_feature_info(Bar WITH_BAR Bar.)
+
+feature_summary(WHAT ALL)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList-stdout.txt
b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList-stdout.txt
new file mode 100644
index 000..4d8f25f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList-stdout.txt
@@ -0,0 +1,7 @@
+-- The following features have been disabled:
+
+ \* Bar , Bar\.
+
+-- The following features have been enabled:
+
+ \* Foo , Foo\.
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList.cmake
b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList.cmake
new file mode 100644
index 000..d04ba88
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList.cmake
@@ -0,0 +1,9 @@
+include(FeatureSummary)
+
+set(WITH_FOO 1)
+set(WITH_BAR 0)
+
+add_feature_info(Foo WITH_FOO Foo.)
+add_feature_info(Bar WITH_BAR Bar.)
+
+feature_summary(WHAT DISABLED_FEATURES ENABLED_FEATURES)
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListAll-result.txt
b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListAll-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListAll-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListAll-stderr.txt
b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListAll-stderr.txt
new file mode 100644
index 000..18d9ebd
--- /dev/null
+++ b/Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListAll-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error at .*/Modules/FeatureSummary\.cmake:[0-9]+. \(message\):
+ The WHAT argument of FEATURE_SUMMARY\(\) contains ALL, which cannot be
+ combined with other values\.
+Call Stack \(most recent call first
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7133-gbb7ed99
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 bb7ed99d5d14027daf888647c0456dc9d7941a7c (commit)
via 620939e4e6f5a61cd5c0fac2704de4bfda0eb7ef (commit)
from 3ecc533f4034efc940a9dc2f4250be24c0376e96 (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=bb7ed99d5d14027daf888647c0456dc9d7941a7c
commit bb7ed99d5d14027daf888647c0456dc9d7941a7c
Merge: 3ecc533 620939e
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Jan 15 18:50:01 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jan 15 18:50:01 2014 -0500
Merge topic 'GNUInstallDirs_debian-multiarch-fix' into next
620939e4 GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on Debian
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=620939e4e6f5a61cd5c0fac2704de4bfda0eb7ef
commit 620939e4e6f5a61cd5c0fac2704de4bfda0eb7ef
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Jan 13 09:31:34 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Jan 15 18:02:21 2014 +0100
GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on Debian
When not installing in /usr (i.e. /usr/local) on Debian/Ubuntu, the
multiarch path is not in ldconfig path, and therefore libraries cannot
be found, unless the user manually modifies the files in
/etc/ld.so.conf.d, in order to include /usr/local/lib/arch.
This patch fixes this issue by using lib/arch only if the user is
installing the software in /usr, and uses lib in all the other cases.
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 9f5b8a4..d868cb3 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -85,7 +85,31 @@ if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
set(CMAKE_INSTALL_LOCALSTATEDIR var CACHE PATH modifiable single-machine
data (var))
endif()
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+# We check if the variable was manually set and not cached, in order to
+# allow projects to set the values as normal variables before including
+# GNUInstallDirs to avoid having the entries cached or user-editable. It
+# replaces the if(NOT DEFINED CMAKE_INSTALL_XXX) checks in all the
+# other cases.
+# If CMAKE_INSTALL_LIBDIR is defined, if _libdir_set is false, then the
+# variable is a normal one, otherwise it is a cache one.
+get_property(_libdir_set CACHE CMAKE_INSTALL_LIBDIR PROPERTY TYPE SET)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
+AND DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
+AND NOT ${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX} STREQUAL
${CMAKE_INSTALL_PREFIX}))
+ # If CMAKE_INSTALL_LIBDIR is not defined, it is always executed.
+ # Otherwise:
+ # * if _libdir_set is false it is not executed (meaning that it is
+ #not a cache variable)
+ # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is not defined it is
+ #not executed
+ # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX and
+ #CMAKE_INSTALL_PREFIX are the same string it is not executed.
+ #_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is updated after the
+ #execution, of this part of code, therefore at the next inclusion
+ #of the file, CMAKE_INSTALL_LIBDIR is defined, and the 2 strings
+ #are equal, meaning that the if is not executed the code the
+ #second time.
+
set(_LIBDIR_DEFAULT lib)
# Override this default 'lib' with 'lib64' iff:
# - we are on Linux system but NOT cross-compiling
@@ -94,13 +118,30 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. i386-linux-gnu
+ # and CMAKE_INSTALL_PREFIX is /usr
# See http://wiki.debian.org/Multiarch
+ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
+set(__LAST_LIBDIR_DEFAULT lib)
+# __LAST_LIBDIR_DEFAULT is the default value that we compute from
+# _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX, not a cache entry for
+# the value that was last used as the default.
+# This value is used to figure out whether the user changed the
+# CMAKE_INSTALL_LIBDIR value manually, or if the value was the
+# default one. When CMAKE_INSTALL_PREFIX changes, the value is
+# updated to the new default, unless the user explicitly changed it.
+ endif()
if(CMAKE_SYSTEM_NAME MATCHES ^(Linux|kFreeBSD|GNU)$
AND NOT CMAKE_CROSSCOMPILING)
if (EXISTS /etc/debian_version) # is this a debian system
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6907-g2fc6ed0
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 2fc6ed03e3a5adb756388e93ffb8b0da50f75445 (commit)
via 37136b3ab6ef8beb394475c042aa8d71e82a4413 (commit)
from 5f76ea1b2e613e0e83d0b81991e5ceb76fd55609 (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=2fc6ed03e3a5adb756388e93ffb8b0da50f75445
commit 2fc6ed03e3a5adb756388e93ffb8b0da50f75445
Merge: 5f76ea1 37136b3
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Jan 9 10:02:04 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 9 10:02:04 2014 -0500
Merge topic 'CheckTypeSize_fix_multiple_invocation' into next
37136b3 CheckTypeSize: Unset variables used during parsing when no longer
needed
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37136b3ab6ef8beb394475c042aa8d71e82a4413
commit 37136b3ab6ef8beb394475c042aa8d71e82a4413
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Jan 9 15:57:07 2014 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Jan 9 15:59:20 2014 +0100
CheckTypeSize: Unset variables used during parsing when no longer needed
When the macro is invoked several time, the parsing variables are not
unset and therefore used for all the following calls.
This fixes issue #14690
diff --git a/Modules/CheckTypeSize.cmake b/Modules/CheckTypeSize.cmake
index a9efae4..ec28d8b 100644
--- a/Modules/CheckTypeSize.cmake
+++ b/Modules/CheckTypeSize.cmake
@@ -222,6 +222,8 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(stddef.h HAVE_STDDEF_H)
endif()
+ unset(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
+ unset(_CHECK_TYPE_SIZE_LANGUAGE)
# Compute or load the size or size map.
set(${VARIABLE}_KEYS)
---
Summary of changes:
Modules/CheckTypeSize.cmake |2 ++
1 files changed, 2 insertions(+), 0 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, next, updated. v2.8.12.1-6181-g8cb8b3b
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 8cb8b3b62ad3072c00dac34559c3e1851b4a46ca (commit) via 62c276f03ef1c8c1c94c885cf2bcf3771f64ec35 (commit) from 2f6589ebc298f1eca198dd6b18b9657e7cd2646f (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=8cb8b3b62ad3072c00dac34559c3e1851b4a46ca commit 8cb8b3b62ad3072c00dac34559c3e1851b4a46ca Merge: 2f6589e 62c276f Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Wed Dec 11 08:10:53 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Dec 11 08:10:53 2013 -0500 Merge topic 'FindSubversion-TortoiseSVN' into next 62c276f FindSubversion: Use TortoiseSVN registry key to locate svn http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62c276f03ef1c8c1c94c885cf2bcf3771f64ec35 commit 62c276f03ef1c8c1c94c885cf2bcf3771f64ec35 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Wed Dec 11 13:59:44 2013 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Wed Dec 11 13:59:48 2013 +0100 FindSubversion: Use TortoiseSVN registry key to locate svn If TortoiseSVN is not installed in the default path, the svn executable installed by TortoiseSVN is not found. Using the registry key should always find it. diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake index 2338721..0d13318 100644 --- a/Modules/FindSubversion.cmake +++ b/Modules/FindSubversion.cmake @@ -73,6 +73,8 @@ # License text for the above reference.) find_program(Subversion_SVN_EXECUTABLE svn + PATHS +[HKEY_LOCAL_MACHINE\\Software\\TortoiseSVN;Directory]/bin DOC subversion command line client) mark_as_advanced(Subversion_SVN_EXECUTABLE) --- Summary of changes: Modules/FindSubversion.cmake |2 ++ 1 files changed, 2 insertions(+), 0 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, next, updated. v2.8.12.1-6113-gebe82f4
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 ebe82f456fb79bc321aee307ee24da4b735095f2 (commit) via 7435ae7c97590a0713d86b63add761d5e1607ec1 (commit) via 0ea589fdfcd9082122829d4959adc842cacbc558 (commit) via 68963b04690f1821a19fc4f888d947b725d2b53c (commit) via 6f6eec1ff69ef9521710a30c749bfb0286752d59 (commit) from 8d76948d996fc656a3f2b8982cc36a4b8457a9f0 (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=ebe82f456fb79bc321aee307ee24da4b735095f2 commit ebe82f456fb79bc321aee307ee24da4b735095f2 Merge: 8d76948 7435ae7 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Mon Dec 9 07:25:30 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Dec 9 07:25:30 2013 -0500 Merge topic 'FindFreetype-2.5' into next 7435ae7 FindFreetype: Find ftheader.h with Freetype 2.5 0ea589f CMake Nightly Date Stamp 68963b0 CMake Nightly Date Stamp 6f6eec1 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7435ae7c97590a0713d86b63add761d5e1607ec1 commit 7435ae7c97590a0713d86b63add761d5e1607ec1 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Mon Dec 9 13:24:28 2013 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Mon Dec 9 13:24:28 2013 +0100 FindFreetype: Find ftheader.h with Freetype 2.5 diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake index 179dc00..9520f7d 100644 --- a/Modules/FindFreetype.cmake +++ b/Modules/FindFreetype.cmake @@ -65,7 +65,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h PATH_SUFFIXES include/freetype2 include ) -find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h +find_path(FREETYPE_INCLUDE_DIR_freetype2 + NAMES +freetype/config/ftheader.h +config/ftheader.h HINTS ENV FREETYPE_DIR PATHS --- Summary of changes: Modules/FindFreetype.cmake |5 - Source/CMakeVersion.cmake |2 +- 2 files changed, 5 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, next, updated. v2.8.12.1-6131-gf3ccb10
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 f3ccb10eee8f1ac0ad2d9f88c93d7eddbdf02172 (commit)
via bc49d820a276243324003bc34d92a69194938adf (commit)
from 2d35d005e98784eafb2e530e528e08da3733ec46 (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=f3ccb10eee8f1ac0ad2d9f88c93d7eddbdf02172
commit f3ccb10eee8f1ac0ad2d9f88c93d7eddbdf02172
Merge: 2d35d00 bc49d82
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Dec 9 13:34:12 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 9 13:34:12 2013 -0500
Merge topic 'FindFreetype-2.5' into next
bc49d82 FindFreetype: Detect version string with Freetype 2.5
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc49d820a276243324003bc34d92a69194938adf
commit bc49d820a276243324003bc34d92a69194938adf
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Dec 9 19:33:42 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Dec 9 19:33:42 2013 +0100
FindFreetype: Detect version string with Freetype 2.5
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 9520f7d..1f12ba6 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -103,8 +103,14 @@ if(FREETYPE_INCLUDE_DIR_ft2build AND
FREETYPE_INCLUDE_DIR_freetype2)
endif()
set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS
${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h)
-file(STRINGS ${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h
freetype_version_str
+if(EXISTS ${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h)
+ set(FREETYPE_H ${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h)
+elseif(EXISTS ${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h)
+ set(FREETYPE_H ${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h)
+endif()
+
+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
+file(STRINGS ${FREETYPE_H} freetype_version_str
REGEX ^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$)
unset(FREETYPE_VERSION_STRING)
---
Summary of changes:
Modules/FindFreetype.cmake | 10 --
1 files changed, 8 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, next, updated. v2.8.12.1-6133-g4213f09
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 4213f09b7f048e906a4eca2f623416533ef3c046 (commit)
via 9b08e3f5993eb004e3eb0d9ae8b593f553989f89 (commit)
from f3ccb10eee8f1ac0ad2d9f88c93d7eddbdf02172 (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=4213f09b7f048e906a4eca2f623416533ef3c046
commit 4213f09b7f048e906a4eca2f623416533ef3c046
Merge: f3ccb10 9b08e3f
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Dec 9 13:39:55 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 9 13:39:55 2013 -0500
Merge topic 'FindFreetype-2.5' into next
9b08e3f FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b08e3f5993eb004e3eb0d9ae8b593f553989f89
commit 9b08e3f5993eb004e3eb0d9ae8b593f553989f89
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Dec 9 19:39:23 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Dec 9 19:39:28 2013 +0100
FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS
In Freetype 2.5 the paths for FREETYPE_INCLUDE_DIR_ft2build and
FREETYPE_INCLUDE_DIR_freetype2 are the same
diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
index 1f12ba6..6f03c86 100644
--- a/Modules/FindFreetype.cmake
+++ b/Modules/FindFreetype.cmake
@@ -100,6 +100,7 @@ find_library(FREETYPE_LIBRARY
# set the user variables
if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
set(FREETYPE_INCLUDE_DIRS
${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2})
+ list(REMOVE_DUPLICATES FREETYPE_INCLUDE_DIRS)
endif()
set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
---
Summary of changes:
Modules/FindFreetype.cmake |1 +
1 files changed, 1 insertions(+), 0 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, next, updated. v2.8.12.1-6091-ga08972e
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 a08972e3d6d9639efa86814e0400f8d3f2512a27 (commit) via 237d1da083feef81280b75dca26cf3a1957d55a6 (commit) from 5cd09b1ad4ee62c6804767889aa65e58ce0f4733 (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=a08972e3d6d9639efa86814e0400f8d3f2512a27 commit a08972e3d6d9639efa86814e0400f8d3f2512a27 Merge: 5cd09b1 237d1da Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Fri Dec 6 14:59:11 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Dec 6 14:59:11 2013 -0500 Merge topic 'ExternalProject-independent-step-targets' into next 237d1da ExternalProject: Fix commit f098870551d156f233c8637219daeb8e1a372cf4 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=237d1da083feef81280b75dca26cf3a1957d55a6 commit 237d1da083feef81280b75dca26cf3a1957d55a6 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Fri Dec 6 20:57:00 2013 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Fri Dec 6 20:57:00 2013 +0100 ExternalProject: Fix commit f098870551d156f233c8637219daeb8e1a372cf4 diff --git a/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake b/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake index fe7f509..57626d6 100644 --- a/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake +++ b/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake @@ -8,7 +8,7 @@ ExternalProject_Add(FOO URL https://example.org/foo.tar.gz) ExternalProject_Add(BAR -URL https://example.org/bar.tar.git +URL https://example.org/bar.tar.gz TEST_COMMAND echo test INDEPENDENT_STEP_TARGETS install) # This one should not give a warning --- Summary of changes: Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake |2 +- 1 files changed, 1 insertions(+), 1 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, next, updated. v2.8.12.1-6050-g0a956ea
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 0a956ea9e6bd8b8d381f097b82ced12b60cef906 (commit) via f098870551d156f233c8637219daeb8e1a372cf4 (commit) from 441cd93e0f6858f278c12e8bdeb3f95da2bc7a7d (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=0a956ea9e6bd8b8d381f097b82ced12b60cef906 commit 0a956ea9e6bd8b8d381f097b82ced12b60cef906 Merge: 441cd93 f098870 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Thu Dec 5 03:22:05 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu Dec 5 03:22:05 2013 -0500 Merge topic 'ExternalProject-independent-step-targets' into next f098870 ExternalProject: Do not require git for RunCMake unit tests http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f098870551d156f233c8637219daeb8e1a372cf4 commit f098870551d156f233c8637219daeb8e1a372cf4 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Wed Dec 4 17:30:47 2013 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Wed Dec 4 17:30:47 2013 +0100 ExternalProject: Do not require git for RunCMake unit tests diff --git a/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake b/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake index dfb7268..fe7f509 100644 --- a/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake +++ b/Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake @@ -5,10 +5,10 @@ include(ExternalProject RESULT_VARIABLE GOO) set_property(DIRECTORY PROPERTY EP_INDEPENDENT_STEP_TARGETS download patch update configure build) ExternalProject_Add(FOO -GIT_REPOSITORY https://example.org/foo.git) +URL https://example.org/foo.tar.gz) ExternalProject_Add(BAR -GIT_REPOSITORY https://example.org/bar.git +URL https://example.org/bar.tar.git TEST_COMMAND echo test INDEPENDENT_STEP_TARGETS install) # This one should not give a warning --- Summary of changes: Tests/RunCMake/ExternalProject/NO_DEPENDS.cmake |4 ++-- 1 files changed, 2 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, next, updated. v2.8.12.1-6052-g9245b5e
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 9245b5e072560f07e1b11c2341caeee386812086 (commit)
via ac954553d814ddc7371f853787cbc29ab2060a0a (commit)
from 0a956ea9e6bd8b8d381f097b82ced12b60cef906 (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=9245b5e072560f07e1b11c2341caeee386812086
commit 9245b5e072560f07e1b11c2341caeee386812086
Merge: 0a956ea ac95455
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Dec 5 04:02:01 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Dec 5 04:02:01 2013 -0500
Merge topic 'ExternalProject-independent-step-targets' into next
ac95455 ExternalProject: Fix tests with ninja
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac954553d814ddc7371f853787cbc29ab2060a0a
commit ac954553d814ddc7371f853787cbc29ab2060a0a
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Dec 5 09:58:22 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Dec 5 09:58:28 2013 +0100
ExternalProject: Fix tests with ninja
Update step for external projects depending on SetupLocal*Repository
is not supposed to be independent, otherwise with parallel builds the
update step might be executed before the repository is ready.
diff --git a/Tests/ExternalProject/CMakeLists.txt
b/Tests/ExternalProject/CMakeLists.txt
index e22d84a..b4dca29 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -309,6 +309,7 @@ if(do_cvs_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalCVSRepository
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER CVS)
@@ -324,6 +325,7 @@ if(do_cvs_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalCVSRepository
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER CVS)
@@ -344,6 +346,7 @@ if(do_cvs_tests)
DEPENDS TutorialStep1-LocalNoDirTGZ
DEPENDS TutorialStep1-CVS-20090626
DEPENDS TutorialStep1-CVS-testtag1
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER CVS)
endif()
@@ -405,6 +408,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalSVNRepository
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER SVN)
@@ -419,6 +423,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalSVNRepository
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER SVN)
@@ -431,6 +436,7 @@ if(do_svn_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalSVNRepository
+INDEPENDENT_STEP_TARGETS
LOG_DOWNLOAD 1
)
set_property(TARGET ${proj} PROPERTY FOLDER SVN)
@@ -485,6 +491,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalGITRepository
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER GIT)
@@ -499,6 +506,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalGITRepository
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER GIT)
@@ -511,6 +519,7 @@ if(do_git_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalGITRepository
+INDEPENDENT_STEP_TARGETS
LOG_UPDATE 1
)
set_property(TARGET ${proj} PROPERTY FOLDER GIT)
@@ -551,6 +560,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalHGRepository
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER HG)
@@ -565,6 +575,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalHGRepository
+INDEPENDENT_STEP_TARGETS
)
set_property(TARGET ${proj} PROPERTY FOLDER HG)
@@ -580,6 +591,7 @@ if(do_hg_tests)
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=INSTALL_DIR
INSTALL_COMMAND
DEPENDS SetupLocalHGRepository
+ INDEPENDENT_STEP_TARGETS
LOG_UPDATE 1
)
set_property(TARGET ${proj} PROPERTY FOLDER HG)
---
Summary of changes:
Tests
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6020-g81a8ccc
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 81a8ccc788ec84ec6c00a4ce17537f04322ed217 (commit)
via 2e189f23eb702fa249fa7f48645f08bc54a79c29 (commit)
via 2f77ffeafe8efcf88168c563c80019647edcf400 (commit)
from 2b59e48b9b6b193a1f24c226fc952739a671154f (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=81a8ccc788ec84ec6c00a4ce17537f04322ed217
commit 81a8ccc788ec84ec6c00a4ce17537f04322ed217
Merge: 2b59e48 2e189f2
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Dec 4 04:37:12 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Dec 4 04:37:12 2013 -0500
Merge topic 'CMakeParseArguments_EmptyArgs' into next
2e189f2 CMakeParseArguments: Make CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
a variable
2f77ffe CMakeParseArguments: Fix tests to run 3.0.0 version before it's
released
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e189f23eb702fa249fa7f48645f08bc54a79c29
commit 2e189f23eb702fa249fa7f48645f08bc54a79c29
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Dec 4 10:34:53 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Dec 4 10:36:02 2013 +0100
CMakeParseArguments: Make CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY a
variable
diff --git a/Modules/CMakeParseArguments.cmake
b/Modules/CMakeParseArguments.cmake
index c75d839..de3f164 100644
--- a/Modules/CMakeParseArguments.cmake
+++ b/Modules/CMakeParseArguments.cmake
@@ -49,8 +49,8 @@
# compatibility, if CMAKE_MINIMUM_REQUIRED_VERSION 3.0.0, the default
# behaviour is to skip empty arguments, otherwise the default behaviour
# is to keep them. Using the CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
-# directory property the user can explicitly set the default behaviour
-# for a folder and its subfolders.
+# variable the user can explicitly set the default behaviour in current
+# scope.
#
#
#
@@ -154,14 +154,6 @@ if(COMMAND cmake_parse_arguments)
endif()
-define_property(DIRECTORY PROPERTY CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
INHERITED
- BRIEF_DOCS Whether empty arguments should be skipped or not by default.
- FULL_DOCS
- See documentation of the cmake_parse_arguments() function in the
- CMakeParseArguments module.
- )
-
-
function(_CMAKE_PARSE_ARGUMENTS_INTERNAL prefix _optionNames _singleArgNames
_multiArgNames _skipEmpty)
set(insideValues FALSE)
set(currentArgName)
@@ -248,9 +240,6 @@ macro(CMAKE_PARSE_ARGUMENTS prefix _optionNames
_singleArgNames _multiArgNames)
set(${prefix}_UNPARSED_ARGUMENTS)
- get_property(_defaultSkipEmptySet DIRECTORY PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY SET)
- get_property(_defaultSkipEmptyDIRECTORY PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY)
-
if(x${ARGN} MATCHES ^xCMAKE_PARSE_ARGUMENTS_(SKIP|KEEP)_EMPTY;?)
if(${CMAKE_MATCH_1} STREQUAL SKIP)
set(_skipEmpty 1)
@@ -258,8 +247,8 @@ macro(CMAKE_PARSE_ARGUMENTS prefix _optionNames
_singleArgNames _multiArgNames)
set(_skipEmpty 0)
endif()
string(REGEX REPLACE ^${CMAKE_MATCH_0} ARGN x${ARGN})
- elseif(_defaultSkipEmptySet)
-set(_skipEmpty ${_defaultSkipEmpty})
+ elseif(DEFINED CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY)
+set(_skipEmpty ${CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY})
elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.0.0)
# Keep compatibility with previous releases
set(_skipEmpty 1)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
index 1913713..55e5c0b 100644
--- a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
include(CMakeParseArguments)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
+set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
macro(MY_INSTALL)
set(options OPTIONAL FAST)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
index 6e0598c..ae8a920 100644
--- a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
include(CMakeParseArguments)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
+set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
macro(MY_INSTALL)
set
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6041-g390474c
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 390474cb8a1771ee605954d6cf3c6d1216be77f9 (commit)
via 84afa2a3ed85eeea3980061407c15f17784f02bc (commit)
from 8bce6e5a88191ba96feb1c19d7f0afa920b8783c (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=390474cb8a1771ee605954d6cf3c6d1216be77f9
commit 390474cb8a1771ee605954d6cf3c6d1216be77f9
Merge: 8bce6e5 84afa2a
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Dec 4 09:24:07 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Dec 4 09:24:07 2013 -0500
Merge topic 'CMakeParseArguments_EmptyArgs' into next
84afa2a CMakeParseArguments: Make CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
a variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84afa2a3ed85eeea3980061407c15f17784f02bc
commit 84afa2a3ed85eeea3980061407c15f17784f02bc
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Dec 4 10:34:53 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Dec 4 15:23:23 2013 +0100
CMakeParseArguments: Make CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY a
variable
diff --git a/Modules/CMakeParseArguments.cmake
b/Modules/CMakeParseArguments.cmake
index c75d839..de3f164 100644
--- a/Modules/CMakeParseArguments.cmake
+++ b/Modules/CMakeParseArguments.cmake
@@ -49,8 +49,8 @@
# compatibility, if CMAKE_MINIMUM_REQUIRED_VERSION 3.0.0, the default
# behaviour is to skip empty arguments, otherwise the default behaviour
# is to keep them. Using the CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
-# directory property the user can explicitly set the default behaviour
-# for a folder and its subfolders.
+# variable the user can explicitly set the default behaviour in current
+# scope.
#
#
#
@@ -154,14 +154,6 @@ if(COMMAND cmake_parse_arguments)
endif()
-define_property(DIRECTORY PROPERTY CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY
INHERITED
- BRIEF_DOCS Whether empty arguments should be skipped or not by default.
- FULL_DOCS
- See documentation of the cmake_parse_arguments() function in the
- CMakeParseArguments module.
- )
-
-
function(_CMAKE_PARSE_ARGUMENTS_INTERNAL prefix _optionNames _singleArgNames
_multiArgNames _skipEmpty)
set(insideValues FALSE)
set(currentArgName)
@@ -248,9 +240,6 @@ macro(CMAKE_PARSE_ARGUMENTS prefix _optionNames
_singleArgNames _multiArgNames)
set(${prefix}_UNPARSED_ARGUMENTS)
- get_property(_defaultSkipEmptySet DIRECTORY PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY SET)
- get_property(_defaultSkipEmptyDIRECTORY PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY)
-
if(x${ARGN} MATCHES ^xCMAKE_PARSE_ARGUMENTS_(SKIP|KEEP)_EMPTY;?)
if(${CMAKE_MATCH_1} STREQUAL SKIP)
set(_skipEmpty 1)
@@ -258,8 +247,8 @@ macro(CMAKE_PARSE_ARGUMENTS prefix _optionNames
_singleArgNames _multiArgNames)
set(_skipEmpty 0)
endif()
string(REGEX REPLACE ^${CMAKE_MATCH_0} ARGN x${ARGN})
- elseif(_defaultSkipEmptySet)
-set(_skipEmpty ${_defaultSkipEmpty})
+ elseif(DEFINED CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY)
+set(_skipEmpty ${CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY})
elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.0.0)
# Keep compatibility with previous releases
set(_skipEmpty 1)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
index 1913713..55e5c0b 100644
--- a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
include(CMakeParseArguments)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
+set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
macro(MY_INSTALL)
set(options OPTIONAL FAST)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
index 6e0598c..ae8a920 100644
--- a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
include(CMakeParseArguments)
-set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
+set(CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
macro(MY_INSTALL)
set(options OPTIONAL FAST)
diff --git a/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
b/Tests/RunCMake/CMakeParseArguments/RunCMakeTest.cmake
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6013-ga5f837c
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 a5f837c6a3a7992439002389030543c432f07fc9 (commit)
via 10fd6fba767be3035a6342f1ccee51ee9a97e601 (commit)
via fa81f53d448e3345459972147922b7e37cb94ba0 (commit)
via cbb72c8fa45c6aa888f5c1f8083306707b8006a5 (commit)
via a40eb5338fa79ec7f4d11dafa7d79328a3a15d6a (commit)
via 67e0d4d95b14aa2481840a4a17ca44bd37f5beb0 (commit)
via 65eeb81e64af3e40a346892afdd977494d1d2bac (commit)
via 96cf67a21121779cdcd8afacfdd508efe1c1a2b5 (commit)
from a1956c508553fe2e04429b6d133b7e5cacb9c004 (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=a5f837c6a3a7992439002389030543c432f07fc9
commit a5f837c6a3a7992439002389030543c432f07fc9
Merge: a1956c5 10fd6fb
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Tue Dec 3 10:23:56 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 3 10:23:56 2013 -0500
Merge topic 'CMakeParseArguments_EmptyArgs' into next
10fd6fb CMakeParseArguments: Add unit tests
fa81f53 CMakeParseArguments: Update documentation
cbb72c8 CMakeParseArguments: Use if(COMMAND) as module guard
a40eb53 CMakeParseArguments: Add workaround for compatibility with CMake =
2.8.12
67e0d4d CMakeParseArguments: Keep compatibility with previous behaviour
65eeb81 CMakeParseArguments: Do not skip empty arguments
96cf67a Make define_property() scriptable
diff --cc Tests/RunCMake/CMakeLists.txt
index 98dde92,bb26396..4cdcef9
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -136,5 -134,5 +136,6 @@@ endif(
add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
+add_RunCMake_test(target_compile_features)
add_RunCMake_test(CheckModules)
+ add_RunCMake_test(CMakeParseArguments)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10fd6fba767be3035a6342f1ccee51ee9a97e601
commit 10fd6fba767be3035a6342f1ccee51ee9a97e601
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Nov 14 11:54:29 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Dec 3 16:20:51 2013 +0100
CMakeParseArguments: Add unit tests
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 209b0b3..bb26396 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -135,3 +135,4 @@ add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
add_RunCMake_test(CheckModules)
+add_RunCMake_test(CMakeParseArguments)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
new file mode 100644
index 000..1913713
--- /dev/null
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
@@ -0,0 +1,29 @@
+# CMAKE_MINIMUM_REQUIRED_VERSION 2.8.12
+# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1
+# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTYKEEP
+# = KEEP
+
+cmake_minimum_required(VERSION 2.8.12)
+
+include(CMakeParseArguments)
+
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1)
+
+macro(MY_INSTALL)
+set(options OPTIONAL FAST)
+set(oneValueArgs DESTINATION RENAME)
+set(multiValueArgs TARGETS CONFIGURATIONS)
+cmake_parse_arguments(MY_INSTALL ${options} ${oneValueArgs}
${multiValueArgs} CMAKE_PARSE_ARGUMENTS_KEEP_EMPTY ${ARGN})
+endmacro()
+
+my_install(DESTINATION TARGETS foo bar)
+
+if(NOT DEFINED MY_INSTALL_DESTINATION)
+message(FATAL_ERROR NOT DEFINED MY_INSTALL_DESTINATION)
+elseif(NOT ${MY_INSTALL_DESTINATION} STREQUAL )
+message(FATAL_ERROR NOT \\${MY_INSTALL_DESTINATION}\ STREQUAL \\)
+endif()
+
+if(NOT ${MY_INSTALL_TARGETS} STREQUAL foo;;bar)
+message(FATAL_ERROR NOT \\${MY_INSTALL_TARGETS}\ STREQUAL \foo;;bar\)
+endif()
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
new file mode 100644
index 000..6e0598c
--- /dev/null
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-SKIP.cmake
@@ -0,0 +1,27 @@
+# CMAKE_MINIMUM_REQUIRED_VERSION 2.8.12
+# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0
+# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTYSKIP
+# = SKIP
+
+cmake_minimum_required(VERSION 2.8.12)
+
+include(CMakeParseArguments)
+
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 0)
+
+macro(MY_INSTALL)
+set
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5897-gb8bbab4
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 b8bbab49a67056db603ae48403de45b3fc758d58 (commit)
via da13eecef80a62ff17dcf4c19bff8729d0e7bc71 (commit)
via d236993695e9a7bf3a4301d84eb3238059fe9a47 (commit)
via bf203c8f8e4a6ad4f642b2653f8abca563484889 (commit)
via 273e66e761589f29b5202ea6e61e0fa890d4bb8e (commit)
via 1acf3c6cae0524925c269d41cd0bddbbcec9f8f9 (commit)
via 8a8cc69e1a3b9a9f35a16290519d8249f14a4029 (commit)
via 3a88afa33e311749358c3abc393804aa421fb4f5 (commit)
via c9d0426ba560d1b70656a3f444ddb7053b7f82e4 (commit)
from 23ebeb79ea28706205d5882fd3b8e242df588957 (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=b8bbab49a67056db603ae48403de45b3fc758d58
commit b8bbab49a67056db603ae48403de45b3fc758d58
Merge: 23ebeb7 da13eec
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Nov 27 18:03:22 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 27 18:03:22 2013 -0500
Merge topic 'CMakeParseArguments_EmptyArgs' into next
da13eec Make define_property() scriptable
d236993 CMakeParseArguments: Add unit tests
bf203c8 CMakeParseArguments: Add workaround for compatibility with CMake =
2.8.12
273e66e CMakeParseArguments: Next release will be 3.0.0, not 2.8.13
1acf3c6 CMakeParseArguments: Avoid replacing CMAKE_MATCH_1
8a8cc69 CMakeParseArguments: Update documentation
3a88afa CMakeParseArguments: Keep compatibility with previous behaviour
c9d0426 CMakeParseArguments: Do not skip empty arguments
diff --cc Tests/RunCMake/CMakeLists.txt
index 89a0794,bb26396..9325b8c
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -135,5 -134,5 +135,6 @@@ endif(
add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
+add_RunCMake_test(target_compile_features)
add_RunCMake_test(CheckModules)
+ add_RunCMake_test(CMakeParseArguments)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da13eecef80a62ff17dcf4c19bff8729d0e7bc71
commit da13eecef80a62ff17dcf4c19bff8729d0e7bc71
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Nov 14 16:14:30 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Nov 28 00:02:22 2013 +0100
Make define_property() scriptable
This will allow CMakeParseArguments and some other modules that use
define_property (i.e. ExternalProject) to be used in script mode.
diff --git a/Source/cmDefinePropertyCommand.h b/Source/cmDefinePropertyCommand.h
index 8dc4d96..c4143cf 100644
--- a/Source/cmDefinePropertyCommand.h
+++ b/Source/cmDefinePropertyCommand.h
@@ -34,6 +34,13 @@ public:
*/
virtual const char* GetName() const { return define_property;}
+ /**
+ * This determines if the command is invoked when in script mode.
+ * define_property() will have no effect in script mode, but this will
+ * make many of the modules usable in cmake/ctest scripts.
+ */
+ virtual bool IsScriptable() const { return true; }
+
cmTypeMacro(cmDefinePropertyCommand, cmCommand);
private:
std::string PropertyName;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d236993695e9a7bf3a4301d84eb3238059fe9a47
commit d236993695e9a7bf3a4301d84eb3238059fe9a47
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Nov 14 11:54:29 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Nov 28 00:02:22 2013 +0100
CMakeParseArguments: Add unit tests
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 209b0b3..bb26396 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -135,3 +135,4 @@ add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
add_RunCMake_test(CheckModules)
+add_RunCMake_test(CMakeParseArguments)
diff --git a/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
new file mode 100644
index 000..1913713
--- /dev/null
+++ b/Tests/RunCMake/CMakeParseArguments/ARGUMENT-KEEP.cmake
@@ -0,0 +1,29 @@
+# CMAKE_MINIMUM_REQUIRED_VERSION 2.8.12
+# CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1
+# CMAKE_PARSE_ARGUMENTS_(KEEP|SKIP)_EMPTYKEEP
+# = KEEP
+
+cmake_minimum_required(VERSION 2.8.12)
+
+include(CMakeParseArguments)
+
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY
CMAKE_PARSE_ARGUMENTS_DEFAULT_SKIP_EMPTY 1
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5899-ga392449
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 a3924493c1cb32063b254efaf62ac592e92df743 (commit) via 8348b99b863f602ac40ac56e84699fb5a3f66012 (commit) from b8bbab49a67056db603ae48403de45b3fc758d58 (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=a3924493c1cb32063b254efaf62ac592e92df743 commit a3924493c1cb32063b254efaf62ac592e92df743 Merge: b8bbab4 8348b99 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Wed Nov 27 18:04:23 2013 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Nov 27 18:04:23 2013 -0500 Merge topic 'ExternalProject-independent-step-targets' into next 8348b99 ExternalProject: Add independent step targets http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8348b99b863f602ac40ac56e84699fb5a3f66012 commit 8348b99b863f602ac40ac56e84699fb5a3f66012 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Tue Nov 19 10:21:26 2013 +0100 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Thu Nov 28 00:03:53 2013 +0100 ExternalProject: Add independent step targets When adding step targets using ExternalProject_Add_StepTargets, the STEP_TARGETS argument or the EP_STEP_TARGETS property, ExternalProject sets all the dependencies for the main project to that target. Due to this, the update target cannot be used without downloading and building all the dependencies. In order to be able to add step targets that do not depend on other external projects, this patch adds: * An optional NO_DEPENDS argument to the ExternalProject_Add_StepTargets function. If this argument is set, then no dependencies are set for the target (file dependencies will still be set). * A new argument INDEPENDENT_STEP_TARGETS to the ExternalProject_Add function and a new directory property EP_INDEPENDENT_STEP_TARGETS that behave like STEP_TARGETS and EP_STEP_TARGETS, but cause the ExternalProject_Add_StepTargets to be called with the NO_DEPENDS argument. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 63f1180..8c21ef0 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -69,6 +69,10 @@ #[LOG_INSTALL 1] # Wrap install in script to log output # #--Custom targets- #[STEP_TARGETS st1 st2 ...] # Generate custom targets for these steps +#[INDEPENDENT_STEP_TARGETS st1 st2 ...] +## Generate custom targets for these steps that +## do not depend on other external project even +## if a dependency is set #) # # The ``*_DIR`` options specify directories for the project, with default @@ -148,18 +152,30 @@ # The ``ExternalProject_Add_StepTargets`` function generates custom # targets for the steps listed:: # -# ExternalProject_Add_StepTargets(name [step1 [step2 [...]]]) +# ExternalProject_Add_StepTargets(name [NO_DEPENDS] [step1 [step2 [...]]]) # -# If ``STEP_TARGETS`` is set then ``ExternalProject_Add_StepTargets`` is -# automatically called at the end of matching calls to -# ``ExternalProject_Add_Step``. Pass ``STEP_TARGETS`` explicitly to +# If ``NO_DEPENDS`` is set, the target will not depend on the +# dependencies of the complete project. This is usually safe to use for +# the download, update, and patch steps that do not require that all the +# dependencies are updated and built. Using ``NO_DEPENDS`` for other +# of the default steps might break parallel builds, so you should avoid, +# it. For custom steps, you should consider whether or not the custom +# commands requires that the dependencies are configured, built and +# installed. +# +# If ``STEP_TARGETS`` or ``INDEPENDENT_STEP_TARGETS`` is set then +# ``ExternalProject_Add_StepTargets`` is automatically called at the end +# of matching calls to ``ExternalProject_Add_Step``. Pass +# ``STEP_TARGETS`` or ``INDEPENDENT_STEP_TARGETS`` explicitly to # individual ``ExternalProject_Add`` calls, or implicitly to all -# ``ExternalProject_Add`` calls by setting the directory property -# ``EP_STEP_TARGETS``. +# ``ExternalProject_Add`` calls by setting the directory properties +# ``EP_STEP_TARGETS`` and ``EP_INDEPENDENT_STEP_TARGETS``. The +# ``INDEPENDENT`` version of the argument and of the property will call +# ``ExternalProject_Add_StepTargets`` with the ``NO_DEPENDS`` argument. # -# If ``STEP_TARGETS`` is not set, clients may still manually call
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5712-g2710aae
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 2710aae7522473b21180799f2de310b0575abc3e (commit)
via 0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd (commit)
via 9e952fbf18bddec90b874d7b0139a6ca3b78f0c9 (commit)
from 75f4a82144cf3643e887ade282da2d12f108f9a9 (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=2710aae7522473b21180799f2de310b0575abc3e
commit 2710aae7522473b21180799f2de310b0575abc3e
Merge: 75f4a82 0e9bf6a
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Sun Nov 24 08:59:30 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Nov 24 08:59:30 2013 -0500
Merge topic 'FindGTK2-quartz-backend' into next
0e9bf6a FindGTK2: Add support for Quartz backend on MAC
9e952fb CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd
commit 0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Sun Nov 24 14:52:39 2013 +0100
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Sun Nov 24 14:53:47 2013 +0100
FindGTK2: Add support for Quartz backend on MAC
Fix issue #14593
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 25c482e..bc66337 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -689,7 +689,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(GDK gdk/gdk.h)
_GTK2_FIND_INCLUDE_DIR(GDKCONFIG gdkconfig.h)
if(UNIX)
-_GTK2_FIND_LIBRARY(GDK gdk-x11 false true)
+if(APPLE)
+_GTK2_FIND_LIBRARY(GDK gdk-quartz false true)
+endif()
+if(NOT GTK2_GDK_FOUND)
+_GTK2_FIND_LIBRARY(GDK gdk-x11 false true)
+endif()
else()
_GTK2_FIND_LIBRARY(GDK gdk-win32 false true)
endif()
@@ -698,7 +703,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_INCLUDE_DIR(GTK gtk/gtk.h)
if(UNIX)
-_GTK2_FIND_LIBRARY(GTK gtk-x11 false true)
+if(APPLE)
+_GTK2_FIND_LIBRARY(GTK gtk-quartz false true)
+endif()
+if(NOT GTK2_GTK_FOUND)
+_GTK2_FIND_LIBRARY(GTK gtk-x11 false true)
+endif()
else()
_GTK2_FIND_LIBRARY(GTK gtk-win32 false true)
endif()
---
Summary of changes:
Modules/FindGTK2.cmake| 14 --
Source/CMakeVersion.cmake |2 +-
2 files changed, 13 insertions(+), 3 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, next, updated. v2.8.12.1-5360-g0072ba9
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 0072ba93394deb607ed645ad54754528884bd337 (commit)
via f0db2e38984c7ac2e2da082b88ec52f378651891 (commit)
from 92908ca87cf4b66afb637bcb3a05612b3ee84fd7 (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=0072ba93394deb607ed645ad54754528884bd337
commit 0072ba93394deb607ed645ad54754528884bd337
Merge: 92908ca f0db2e3
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Tue Nov 19 11:09:32 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Nov 19 11:09:32 2013 -0500
Merge topic 'macro-args-docs' into next
f0db2e3 Help: Document macro argument caveats in more detail
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0db2e38984c7ac2e2da082b88ec52f378651891
commit f0db2e38984c7ac2e2da082b88ec52f378651891
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Nov 18 14:30:52 2013 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Nov 19 09:01:54 2013 -0500
Help: Document macro argument caveats in more detail
Add notes about macro arguments in the foreach, if, and list commands.
Add a section to the macro command documentation explaining in detail
how macro arguments are not variables.
diff --git a/Help/command/foreach.rst b/Help/command/foreach.rst
index 8f9710c..348ebd8 100644
--- a/Help/command/foreach.rst
+++ b/Help/command/foreach.rst
@@ -42,5 +42,6 @@ three types of this iteration:
Iterates over a precise list of items. The LISTS option names
list-valued variables to be traversed, including empty elements (an
-empty string is a zero-length list). The ITEMS option ends argument
+empty string is a zero-length list). (Note macro
+arguments are not variables.) The ITEMS option ends argument
parsing and includes all arguments following it in the iteration.
diff --git a/Help/command/if.rst b/Help/command/if.rst
index b879ae1..0279be7 100644
--- a/Help/command/if.rst
+++ b/Help/command/if.rst
@@ -166,7 +166,8 @@ major[.minor[.patch[.tweak]]]).
if(DEFINED variable)
True if the given variable is defined. It does not matter if the
-variable is true or false just if it has been set.
+variable is true or false just if it has been set. (Note macro
+arguments are not variables.)
::
diff --git a/Help/command/list.rst b/Help/command/list.rst
index f044dba..aeb1e94 100644
--- a/Help/command/list.rst
+++ b/Help/command/list.rst
@@ -50,7 +50,8 @@ propagation.
NOTES: A list in cmake is a ; separated group of strings. To create a
list the set command can be used. For example, set(var a b c d e)
creates a list with a;b;c;d;e, and set(var a b c d e) creates a
-string or a list with one item in it.
+string or a list with one item in it. (Note macro arguments are not
+variables, and therefore cannot be used in LIST commands.)
When specifying index values, if element index is 0 or greater, it
is indexed from the beginning of the list, with 0 representing the
diff --git a/Help/command/macro.rst b/Help/command/macro.rst
index aa16352..258dc50 100644
--- a/Help/command/macro.rst
+++ b/Help/command/macro.rst
@@ -15,19 +15,53 @@ Define a macro named name that takes arguments named arg1
arg2 arg3
(...). Commands listed after macro, but before the matching endmacro,
are not invoked until the macro is invoked. When it is invoked, the
commands recorded in the macro are first modified by replacing formal
-parameters (${arg1}) with the arguments passed, and then invoked as
+parameters (``${arg1}``) with the arguments passed, and then invoked as
normal commands. In addition to referencing the formal parameters you
-can reference the values ${ARGC} which will be set to the number of
-arguments passed into the function as well as ${ARGV0} ${ARGV1}
-${ARGV2} ... which will have the actual values of the arguments
+can reference the values ``${ARGC}`` which will be set to the number of
+arguments passed into the function as well as ``${ARGV0}`` ``${ARGV1}``
+``${ARGV2}`` ... which will have the actual values of the arguments
passed in. This facilitates creating macros with optional arguments.
-Additionally ${ARGV} holds the list of all arguments given to the
-macro and ${ARGN} holds the list of arguments past the last expected
-argument. Note that the parameters to a macro and values such as ARGN
-are not variables in the usual CMake sense. They are string
-replacements much like the C preprocessor would do with a macro. If
-you want true CMake variables and/or better CMake scope control you
-should look at the function
[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5131-g9cbfb82
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 9cbfb82e873f1c3cc454da2482d163d7e7a7e4f0 (commit)
via bf755c7c381d8d7d84578bf2dc4ac673aefa090a (commit)
via bc280f1c8108809abed700c2fe039340bb9ae1c0 (commit)
via 20afbd5e037a0ccfa55af8564ed8cd3ec2430540 (commit)
from 9628802de3783ebf22600afda108e8356953d9f6 (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=9cbfb82e873f1c3cc454da2482d163d7e7a7e4f0
commit 9cbfb82e873f1c3cc454da2482d163d7e7a7e4f0
Merge: 9628802 bf755c7
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Nov 13 11:33:50 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Nov 13 11:33:50 2013 -0500
Merge topic 'set_emptyvar_PARENT_SCOPE' into next
bf755c7 set: Add unit tests for set/unset PARENT_SCOPE
bc280f1 set: Fix handling of empty value with PARENT_SCOPE
20afbd5 set: Handle value-less PARENT_SCOPE explicitly
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf755c7c381d8d7d84578bf2dc4ac673aefa090a
commit bf755c7c381d8d7d84578bf2dc4ac673aefa090a
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Nov 13 09:18:18 2013 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Nov 13 10:18:38 2013 -0500
set: Add unit tests for set/unset PARENT_SCOPE
Create a RunCMake.set test to cover set() command cases, starting with
PARENT_SCOPE.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index bf3dcc1..bb1b909 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -107,6 +107,7 @@ add_RunCMake_test(list)
add_RunCMake_test(message)
add_RunCMake_test(string)
add_RunCMake_test(try_compile)
+add_RunCMake_test(set)
add_RunCMake_test(variable_watch)
add_RunCMake_test(CMP0004)
add_RunCMake_test(TargetPolicies)
diff --git a/Tests/RunCMake/set/CMakeLists.txt
b/Tests/RunCMake/set/CMakeLists.txt
new file mode 100644
index 000..4b3de84
--- /dev/null
+++ b/Tests/RunCMake/set/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.12)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/set/PARENT_SCOPE-result.txt
b/Tests/RunCMake/set/PARENT_SCOPE-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/set/PARENT_SCOPE-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/set/PARENT_SCOPE.cmake
b/Tests/RunCMake/set/PARENT_SCOPE.cmake
new file mode 100644
index 000..9bd6bca
--- /dev/null
+++ b/Tests/RunCMake/set/PARENT_SCOPE.cmake
@@ -0,0 +1,33 @@
+set(FOO )
+set(BAR bar)
+set(BAZ baz)
+set(BOO boo)
+
+function(_parent_scope)
+set(FOO foo PARENT_SCOPE)
+set(BAR PARENT_SCOPE)
+set(BAZ PARENT_SCOPE)
+unset(BOO PARENT_SCOPE)
+endfunction()
+
+_parent_scope()
+
+if(NOT DEFINED FOO)
+ message(FATAL_ERROR FOO not defined)
+elseif(NOT ${FOO} STREQUAL foo)
+ message(FATAL_ERROR FOO should be \foo\, not \${FOO}\)
+endif()
+
+if(NOT DEFINED BAR)
+ message(FATAL_ERROR BAR not defined)
+elseif(NOT ${BAR} STREQUAL )
+ message(FATAL_ERROR BAR should be an empty string, not \${BAR}\)
+endif()
+
+if(DEFINED BAZ)
+ message(FATAL_ERROR BAZ defined)
+endif()
+
+if(DEFINED BOO)
+ message(FATAL_ERROR BOO defined)
+endif()
diff --git a/Tests/RunCMake/set/RunCMakeTest.cmake
b/Tests/RunCMake/set/RunCMakeTest.cmake
new file mode 100644
index 000..5d036e3
--- /dev/null
+++ b/Tests/RunCMake/set/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(PARENT_SCOPE)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc280f1c8108809abed700c2fe039340bb9ae1c0
commit bc280f1c8108809abed700c2fe039340bb9ae1c0
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Nov 13 09:02:56 2013 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Nov 13 10:15:56 2013 -0500
set: Fix handling of empty value with PARENT_SCOPE
Just as
set(VAR )
sets VAR to an empty string in the current scope, the code
set(VAR PARENT_SCOPE)
is documented to set the variable to an empty string in the parent
scope. Fix the implementation to make it so.
diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index 22b4383..bb193bf 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -122,15 +122,8 @@ bool cmSetCommand
if (parentScope)
{
-if (value.empty())
- {
- this-Makefile-RaiseScope(variable, 0);
- }
-else
- {
- this-Makefile-RaiseScope(variable, value.c_str
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4431-gda16b28
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 da16b288e1339970ec17de01f781b0d2b5c4b3fc (commit)
via e04402f002a144fa25cb5973372a226513d9b74b (commit)
from d919aa5542c23c063c998064f856a8b3f2996101 (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=da16b288e1339970ec17de01f781b0d2b5c4b3fc
commit da16b288e1339970ec17de01f781b0d2b5c4b3fc
Merge: d919aa5 e04402f
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Sat Oct 5 10:35:56 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Oct 5 10:35:56 2013 -0400
Merge topic 'CheckStructHasMember_CXX' into next
e04402f CheckStructHasMember: Do not use an empty struct for tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e04402f002a144fa25cb5973372a226513d9b74b
commit e04402f002a144fa25cb5973372a226513d9b74b
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Oct 4 15:43:42 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Oct 4 15:43:42 2013 +0200
CheckStructHasMember: Do not use an empty struct for tests
Some compilers do not accept that
diff --git a/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
b/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
index 6902c38..f06d5c3 100644
--- a/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
+++ b/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
@@ -14,8 +14,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
message(STATUS Testing configuration ${_config_type})
check_struct_has_member(struct non_existent_struct foo cm_cshm.h
CSHM_RESULT_S1_${_config_type})
-check_struct_has_member(struct struct_with_non_existent_members foo
cm_cshm.h CSHM_RESULT_S2_${_config_type})
-check_struct_has_member(struct struct_with_member foo cm_cshm.h
CSHM_RESULT_S3_${_config_type})
+check_struct_has_member(struct struct_with_member non_existent_member
cm_cshm.h CSHM_RESULT_S2_${_config_type})
+check_struct_has_member(struct struct_with_member member cm_cshm.h
CSHM_RESULT_S3_${_config_type})
if(CSHM_RESULT_S1_${_config_type} OR CSHM_RESULT_S2_${_config_type})
message(SEND_ERROR CheckStructHasMember reported a nonexistent member
as existing in configuration ${_config_type})
@@ -24,7 +24,6 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
if(NOT CSHM_RESULT_S3_${_config_type})
message(SEND_ERROR CheckStructHasMember did not report an existent
member as existing in configuration ${_config_type})
endif()
-
endforeach()
foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
@@ -35,8 +34,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
message(STATUS Testing configuration ${_config_type})
check_struct_has_member(struct non_existent_struct foo cm_cshm.h
CSHM_RESULT_S1_${_config_type}_C LANGUAGE C)
-check_struct_has_member(struct struct_with_non_existent_members foo
cm_cshm.h CSHM_RESULT_S2_${_config_type}_C LANGUAGE C)
-check_struct_has_member(struct struct_with_member foo cm_cshm.h
CSHM_RESULT_S3_${_config_type}_C LANGUAGE C)
+check_struct_has_member(struct struct_with_member non_existent_member
cm_cshm.h CSHM_RESULT_S2_${_config_type}_C LANGUAGE C)
+check_struct_has_member(struct struct_with_member member cm_cshm.h
CSHM_RESULT_S3_${_config_type}_C LANGUAGE C)
if(CSHM_RESULT_S1_${_config_type}_C OR CSHM_RESULT_S2_${_config_type}_C)
message(SEND_ERROR CheckStructHasMember reported a nonexistent member
as existing in configuration ${_config_type})
@@ -59,8 +58,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
message(STATUS Testing configuration ${_config_type})
check_struct_has_member(non_existent_struct foo cm_cshm.h
CSHM_RESULT_S1_${_config_type}_CXX LANGUAGE CXX)
-check_struct_has_member(struct_with_non_existent_members foo
cm_cshm.h CSHM_RESULT_S2_${_config_type}_CXX LANGUAGE CXX)
-check_struct_has_member(struct_with_member foo cm_cshm.h
CSHM_RESULT_S3_${_config_type}_CXX LANGUAGE CXX)
+check_struct_has_member(struct_with_non_existent_members
non_existent_member cm_cshm.h CSHM_RESULT_S2_${_config_type}_CXX LANGUAGE
CXX)
+check_struct_has_member(struct struct_with_member member cm_cshm.h
CSHM_RESULT_S3_${_config_type}_CXX LANGUAGE CXX)
check_struct_has_member(ns::non_existent_class foo cm_cshm.hxx
CSHM_RESULT_C1_${_config_type}_CXX LANGUAGE CXX)
check_struct_has_member(ns::class_with_non_existent_members foo
cm_cshm.hxx
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4420-g80d3738
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 80d3738bcf4797b7b3286d4b66ac5648fc2d196e (commit)
via 5054a9626ba84ebc41306ada4cab9e0d137502dd (commit)
from bd3847559d06072867a48f954a9065f384dd5727 (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=80d3738bcf4797b7b3286d4b66ac5648fc2d196e
commit 80d3738bcf4797b7b3286d4b66ac5648fc2d196e
Merge: bd38475 5054a96
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Oct 3 11:33:07 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Oct 3 11:33:07 2013 -0400
Merge topic 'FindGTK2-targets' into next
5054a96 FindGTK2: Make pangocairo and cairo optional dependencies
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5054a9626ba84ebc41306ada4cab9e0d137502dd
commit 5054a9626ba84ebc41306ada4cab9e0d137502dd
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Thu Oct 3 17:26:16 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Oct 3 17:26:16 2013 +0200
FindGTK2: Make pangocairo and cairo optional dependencies
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 548e63d..500cec7 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -651,7 +651,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
else()
_GTK2_FIND_LIBRARY(GDK gdk-win32 false true)
endif()
-_GTK2_ADD_TARGET (GDK GTK2_DEPENDS pangocairo pango cairo gdk_pixbuf
gobject glib)
+_GTK2_ADD_TARGET (GDK GTK2_DEPENDS pango gdk_pixbuf gobject glib
+ GTK2_OPTIONAL_DEPENDS pangocairo cairo)
_GTK2_FIND_INCLUDE_DIR(GTK gtk/gtk.h)
if(UNIX)
@@ -659,8 +660,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
else()
_GTK2_FIND_LIBRARY(GTK gtk-win32 false true)
endif()
-_GTK2_ADD_TARGET (GTK GTK2_DEPENDS gdk atk pangoft2 pangocairo pango
cairo gdk_pixbuf gthread gobject glib
- GTK2_OPTIONAL_DEPENDS gio)
+_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
_GTK2_FIND_INCLUDE_DIR(FONTCONFIG fontconfig/fontconfig.h)
@@ -695,30 +696,31 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_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 pangocairo sigc++
pango cairo gobject glib
- GTK2_OPTIONAL_DEPENDS cairomm
+_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})
_GTK2_FIND_INCLUDE_DIR(GDKMM gdkmm.h)
_GTK2_FIND_INCLUDE_DIR(GDKMMCONFIG gdkmmconfig.h)
_GTK2_FIND_LIBRARY(GDKMM gdkmm true true)
-_GTK2_ADD_TARGET (GDKMM GTK2_DEPENDS pangomm gtk glibmm sigc++
gdk atk pangoft2 pangocairo gdk_pixbuf cairo pango gobject glib
- GTK2_OPTIONAL_DEPENDS giomm cairomm gio
+_GTK2_ADD_TARGET (GDKMM GTK2_DEPENDS pangomm gtk glibmm sigc++
gdk atk pangoft2 gdk_pixbuf pango gobject glib
+ GTK2_OPTIONAL_DEPENDS giomm cairomm gio
pangocairo cairo
OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
_GTK2_FIND_INCLUDE_DIR(GTKMM gtkmm.h)
_GTK2_FIND_INCLUDE_DIR(GTKMMCONFIG gtkmmconfig.h)
_GTK2_FIND_LIBRARY(GTKMM gtkmm true true)
-_GTK2_ADD_TARGET (GTKMM GTK2_DEPENDS atkmm gdkmm pangomm gtk
glibmm sigc++ gdk atk pangoft2 pangocairo gdk_pixbuf cairo pango gthread
gobject glib
- GTK2_OPTIONAL_DEPENDS giomm cairomm gio
+_GTK2_ADD_TARGET (GTKMM GTK2_DEPENDS atkmm gdkmm pangomm gtk
glibmm sigc++ gdk atk pangoft2 gdk_pixbuf pango gthread gobject glib
+ GTK2_OPTIONAL_DEPENDS giomm cairomm gio
pangocairo cairo
OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4399-g4bb81b8
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 4bb81b80c579682187b04be104e9b6212fc4c456 (commit) via 0f2c22ea2bd640bc388d63f9ff99bf4732da832b (commit) from 6071f47dcbe4a98c2b60f8141927d6d88dc5e822 (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=4bb81b80c579682187b04be104e9b6212fc4c456 commit 4bb81b80c579682187b04be104e9b6212fc4c456 Merge: 6071f47 0f2c22e Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Wed Oct 2 05:58:26 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Oct 2 05:58:26 2013 -0400 Merge topic 'FindGTK2-targets' into next 0f2c22e FindGTK: Specify languages used by tests http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f2c22ea2bd640bc388d63f9ff99bf4732da832b commit 0f2c22ea2bd640bc388d63f9ff99bf4732da832b Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Wed Oct 2 11:57:20 2013 +0200 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Wed Oct 2 11:57:25 2013 +0200 FindGTK: Specify languages used by tests This will avoid checking for unneeded compilers, and should make tests slightly faster. diff --git a/Tests/FindGTK2/atk/CMakeLists.txt b/Tests/FindGTK2/atk/CMakeLists.txt index 1eee089..61f1293 100644 --- a/Tests/FindGTK2/atk/CMakeLists.txt +++ b/Tests/FindGTK2/atk/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(atk) +project(atk C) find_package(GTK2 COMPONENTS gtk REQUIRED) diff --git a/Tests/FindGTK2/atkmm/CMakeLists.txt b/Tests/FindGTK2/atkmm/CMakeLists.txt index fe39b16..32dfccb 100644 --- a/Tests/FindGTK2/atkmm/CMakeLists.txt +++ b/Tests/FindGTK2/atkmm/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(atkmm) +project(atkmm CXX) find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) diff --git a/Tests/FindGTK2/cairo/CMakeLists.txt b/Tests/FindGTK2/cairo/CMakeLists.txt index 8baa057..48f0dab 100644 --- a/Tests/FindGTK2/cairo/CMakeLists.txt +++ b/Tests/FindGTK2/cairo/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(cairo) +project(cairo C) find_package(GTK2 COMPONENTS gtk REQUIRED) diff --git a/Tests/FindGTK2/cairomm/CMakeLists.txt b/Tests/FindGTK2/cairomm/CMakeLists.txt index 9c81266..5861b96 100644 --- a/Tests/FindGTK2/cairomm/CMakeLists.txt +++ b/Tests/FindGTK2/cairomm/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(cairomm) +project(cairomm CXX) find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) diff --git a/Tests/FindGTK2/gdk/CMakeLists.txt b/Tests/FindGTK2/gdk/CMakeLists.txt index 401b7b1..d55d0d5 100644 --- a/Tests/FindGTK2/gdk/CMakeLists.txt +++ b/Tests/FindGTK2/gdk/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(gdk) +project(gdk C) find_package(GTK2 COMPONENTS gtk REQUIRED) diff --git a/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt b/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt index 50cc23c..121bb66 100644 --- a/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt +++ b/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(gdk_pixbuf) +project(gdk_pixbuf C) find_package(GTK2 COMPONENTS gtk REQUIRED) diff --git a/Tests/FindGTK2/gdkmm/CMakeLists.txt b/Tests/FindGTK2/gdkmm/CMakeLists.txt index f2960b5..1215691 100644 --- a/Tests/FindGTK2/gdkmm/CMakeLists.txt +++ b/Tests/FindGTK2/gdkmm/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(gdkmm) +project(gdkmm CXX) find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) diff --git a/Tests/FindGTK2/gio/CMakeLists.txt b/Tests/FindGTK2/gio/CMakeLists.txt index 56eee88..1229c25 100644 --- a/Tests/FindGTK2/gio/CMakeLists.txt +++ b/Tests/FindGTK2/gio/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(gio) +project(gio C) find_package(GTK2 COMPONENTS gtk REQUIRED) diff --git a/Tests/FindGTK2/giomm/CMakeLists.txt b/Tests/FindGTK2/giomm/CMakeLists.txt index ff55df6..171125a 100644 --- a/Tests/FindGTK2/giomm/CMakeLists.txt +++ b/Tests/FindGTK2/giomm/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(giomm) +project(giomm CXX) find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) diff --git a/Tests/FindGTK2/glib/CMakeLists.txt b/Tests/FindGTK2/glib/CMakeLists.txt index 068a6fd..f01554a 100644 --- a/Tests/FindGTK2/glib/CMakeLists.txt +++ b/Tests/FindGTK2/glib/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(glib) +project(glib C) find_package(GTK2 COMPONENTS gtk
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4401-gc08f1c9
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 c08f1c96b064a567b972e1cc954ded738c9cb9f3 (commit) via b7c15165a86a7a92150662b389bbcfb0ec165c6c (commit) from 4bb81b80c579682187b04be104e9b6212fc4c456 (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=c08f1c96b064a567b972e1cc954ded738c9cb9f3 commit c08f1c96b064a567b972e1cc954ded738c9cb9f3 Merge: 4bb81b8 b7c1516 Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Wed Oct 2 06:26:53 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Oct 2 06:26:53 2013 -0400 Merge topic 'FindGTK2-targets' into next b7c1516 FindGTK2: Avoid ctest truncation of output and make it verbose http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7c15165a86a7a92150662b389bbcfb0ec165c6c commit b7c15165a86a7a92150662b389bbcfb0ec165c6c Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Wed Oct 2 12:26:10 2013 +0200 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Wed Oct 2 12:26:10 2013 +0200 FindGTK2: Avoid ctest truncation of output and make it verbose diff --git a/Tests/FindGTK2/atk/CMakeLists.txt b/Tests/FindGTK2/atk/CMakeLists.txt index 61f1293..f466c2a 100644 --- a/Tests/FindGTK2/atk/CMakeLists.txt +++ b/Tests/FindGTK2/atk/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(atk C) +message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) +set(CMAKE_VERBOSE_MAKEFILE 1) + find_package(GTK2 COMPONENTS gtk REQUIRED) include(CMakePrintHelpers) diff --git a/Tests/FindGTK2/atkmm/CMakeLists.txt b/Tests/FindGTK2/atkmm/CMakeLists.txt index 32dfccb..4d537d3 100644 --- a/Tests/FindGTK2/atkmm/CMakeLists.txt +++ b/Tests/FindGTK2/atkmm/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(atkmm CXX) +message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) +set(CMAKE_VERBOSE_MAKEFILE 1) + find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) include(CMakePrintHelpers) diff --git a/Tests/FindGTK2/cairo/CMakeLists.txt b/Tests/FindGTK2/cairo/CMakeLists.txt index 48f0dab..396ee94 100644 --- a/Tests/FindGTK2/cairo/CMakeLists.txt +++ b/Tests/FindGTK2/cairo/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(cairo C) +message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) +set(CMAKE_VERBOSE_MAKEFILE 1) + find_package(GTK2 COMPONENTS gtk REQUIRED) include(CMakePrintHelpers) diff --git a/Tests/FindGTK2/cairomm/CMakeLists.txt b/Tests/FindGTK2/cairomm/CMakeLists.txt index 5861b96..ff44f78 100644 --- a/Tests/FindGTK2/cairomm/CMakeLists.txt +++ b/Tests/FindGTK2/cairomm/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(cairomm CXX) +message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) +set(CMAKE_VERBOSE_MAKEFILE 1) + find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) include(CMakePrintHelpers) diff --git a/Tests/FindGTK2/gdk/CMakeLists.txt b/Tests/FindGTK2/gdk/CMakeLists.txt index d55d0d5..b5e4733 100644 --- a/Tests/FindGTK2/gdk/CMakeLists.txt +++ b/Tests/FindGTK2/gdk/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(gdk C) +message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) +set(CMAKE_VERBOSE_MAKEFILE 1) + find_package(GTK2 COMPONENTS gtk REQUIRED) include(CMakePrintHelpers) diff --git a/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt b/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt index 121bb66..3b99e61 100644 --- a/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt +++ b/Tests/FindGTK2/gdk_pixbuf/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(gdk_pixbuf C) +message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) +set(CMAKE_VERBOSE_MAKEFILE 1) + find_package(GTK2 COMPONENTS gtk REQUIRED) include(CMakePrintHelpers) diff --git a/Tests/FindGTK2/gdkmm/CMakeLists.txt b/Tests/FindGTK2/gdkmm/CMakeLists.txt index 1215691..8e97784 100644 --- a/Tests/FindGTK2/gdkmm/CMakeLists.txt +++ b/Tests/FindGTK2/gdkmm/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(gdkmm CXX) +message(STATUS CTEST_FULL_OUTPUT (Avoid ctest truncation of output)) +set(CMAKE_VERBOSE_MAKEFILE 1) + find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) include(CMakePrintHelpers) diff --git a/Tests/FindGTK2/gio/CMakeLists.txt b/Tests/FindGTK2/gio/CMakeLists.txt index 1229c25..3894a25 100644 --- a/Tests/FindGTK2/gio/CMakeLists.txt +++ b/Tests/FindGTK2/gio/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8) project(gio
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4404-g79f9644
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 79f96440eb8869f253a23f6747762f221c0069a6 (commit)
via e66277d5d692a22f3beb0c67c5797f16d7cdba29 (commit)
via 945734ed1b5dc348512b8e297580e8730cef1757 (commit)
from c08f1c96b064a567b972e1cc954ded738c9cb9f3 (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=79f96440eb8869f253a23f6747762f221c0069a6
commit 79f96440eb8869f253a23f6747762f221c0069a6
Merge: c08f1c9 e66277d
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Oct 2 07:09:47 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 2 07:09:47 2013 -0400
Merge topic 'CheckStructHasMember_CXX' into next
e66277d CheckStructHasMember: Add unit tests
945734e [CheckStructHasMember] Add support for C++
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e66277d5d692a22f3beb0c67c5797f16d7cdba29
commit e66277d5d692a22f3beb0c67c5797f16d7cdba29
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Oct 2 13:08:44 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Oct 2 13:08:44 2013 +0200
CheckStructHasMember: Add unit tests
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index be7ddbc..7586de6 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -19,6 +19,8 @@ add_CMakeOnly_test(CheckCXXCompilerFlag)
add_CMakeOnly_test(CheckLanguage)
+add_CMakeOnly_test(CheckStructHasMember)
+
add_CMakeOnly_test(CompilerIdC)
add_CMakeOnly_test(CompilerIdCXX)
if(CMAKE_Fortran_COMPILER)
diff --git a/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
b/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
new file mode 100644
index 000..6902c38
--- /dev/null
+++ b/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
@@ -0,0 +1,94 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(CheckStructHasMember)
+
+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR})
+
+include(CheckStructHasMember)
+
+foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
+set(CMAKE_TRY_COMPILE_CONFIGURATION ${_config_type})
+unset(CSHM_RESULT_S1_${_config_type} CACHE)
+unset(CSHM_RESULT_S2_${_config_type} CACHE)
+unset(CSHM_RESULT_S3_${_config_type} CACHE)
+message(STATUS Testing configuration ${_config_type})
+
+check_struct_has_member(struct non_existent_struct foo cm_cshm.h
CSHM_RESULT_S1_${_config_type})
+check_struct_has_member(struct struct_with_non_existent_members foo
cm_cshm.h CSHM_RESULT_S2_${_config_type})
+check_struct_has_member(struct struct_with_member foo cm_cshm.h
CSHM_RESULT_S3_${_config_type})
+
+if(CSHM_RESULT_S1_${_config_type} OR CSHM_RESULT_S2_${_config_type})
+message(SEND_ERROR CheckStructHasMember reported a nonexistent member
as existing in configuration ${_config_type})
+endif()
+
+if(NOT CSHM_RESULT_S3_${_config_type})
+message(SEND_ERROR CheckStructHasMember did not report an existent
member as existing in configuration ${_config_type})
+endif()
+
+endforeach()
+
+foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
+set(CMAKE_TRY_COMPILE_CONFIGURATION ${_config_type})
+unset(CSHM_RESULT_S1_${_config_type}_C CACHE)
+unset(CSHM_RESULT_S2_${_config_type}_C CACHE)
+unset(CSHM_RESULT_S3_${_config_type}_C CACHE)
+message(STATUS Testing configuration ${_config_type})
+
+check_struct_has_member(struct non_existent_struct foo cm_cshm.h
CSHM_RESULT_S1_${_config_type}_C LANGUAGE C)
+check_struct_has_member(struct struct_with_non_existent_members foo
cm_cshm.h CSHM_RESULT_S2_${_config_type}_C LANGUAGE C)
+check_struct_has_member(struct struct_with_member foo cm_cshm.h
CSHM_RESULT_S3_${_config_type}_C LANGUAGE C)
+
+if(CSHM_RESULT_S1_${_config_type}_C OR CSHM_RESULT_S2_${_config_type}_C)
+message(SEND_ERROR CheckStructHasMember reported a nonexistent member
as existing in configuration ${_config_type})
+endif()
+
+if(NOT CSHM_RESULT_S3_${_config_type}_C)
+message(SEND_ERROR CheckStructHasMember did not report an existent
member as existing in configuration ${_config_type})
+endif()
+endforeach()
+
+foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
+set(CMAKE_TRY_COMPILE_CONFIGURATION ${_config_type})
+unset(CSHM_RESULT_S1_${_config_type}_CXX CACHE)
+unset(CSHM_RESULT_S2_${_config_type}_CXX CACHE)
+unset(CSHM_RESULT_S3_${_config_type}_CXX CACHE)
+unset(CSHM_RESULT_C1_${_config_type}_CXX CACHE)
+unset(CSHM_RESULT_C2_
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4407-g0019a50
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 0019a5018a6eaea919f66d1f39e0312f9da5c1ea (commit)
via b7f508fe64d94a02ceea860579ae700efc73f795 (commit)
via e0f041f2e874b80bc196c36ab440652790b00102 (commit)
from 79f96440eb8869f253a23f6747762f221c0069a6 (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=0019a5018a6eaea919f66d1f39e0312f9da5c1ea
commit 0019a5018a6eaea919f66d1f39e0312f9da5c1ea
Merge: 79f9644 b7f508f
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Oct 2 12:35:18 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 2 12:35:18 2013 -0400
Merge topic 'CheckStructHasMember_CXX' into next
b7f508f Merge topic 'deprecation-message' into CheckStructHasMember_CXX
e0f041f CheckStructHasMember: Add more unit tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7f508fe64d94a02ceea860579ae700efc73f795
commit b7f508fe64d94a02ceea860579ae700efc73f795
Merge: e0f041f 3e781fc
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Oct 2 18:34:24 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Oct 2 18:34:24 2013 +0200
Merge topic 'deprecation-message' into CheckStructHasMember_CXX
Conflicts:
Tests/RunCMake/CMakeLists.txt
diff --cc Tests/RunCMake/CMakeLists.txt
index 35c8e13,cc52e9e..f1c09bc
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -119,4 -119,4 +119,5 @@@ endif(
add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
+ add_RunCMake_test(deprecation)
+add_RunCMake_test(CheckModules)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0f041f2e874b80bc196c36ab440652790b00102
commit e0f041f2e874b80bc196c36ab440652790b00102
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Oct 2 17:37:03 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Oct 2 17:37:03 2013 +0200
CheckStructHasMember: Add more unit tests
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index e45aba3..35c8e13 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -119,3 +119,4 @@ endif()
add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
+add_RunCMake_test(CheckModules)
diff --git a/Tests/RunCMake/CheckModules/CMakeLists.txt
b/Tests/RunCMake/CheckModules/CMakeLists.txt
new file mode 100644
index 000..65ac8e8
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.11)
+project(${RunCMake_TEST})
+include(${RunCMake_TEST}.cmake)
diff --git
a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-result.txt
b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-result.txt
@@ -0,0 +1 @@
+1
diff --git
a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-stderr.txt
b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-stderr.txt
new file mode 100644
index 000..1b8603a
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at .*/Modules/CheckStructHasMember.cmake:[0-9]+. \(message\):
+ Unknown arguments:
+
+C
+
+Call Stack \(most recent call first\):
+ CheckStructHasMemberMissingKey.cmake:[0-9]+ \(check_struct_has_member\)
+ CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey.cmake
b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey.cmake
new file mode 100644
index 000..49f51ce
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey.cmake
@@ -0,0 +1,2 @@
+include(CheckStructHasMember)
+check_struct_has_member(struct timeval tv_sec sys/select.h
HAVE_TIMEVAL_TV_SEC_K C)
diff --git
a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-result.txt
b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-result.txt
@@ -0,0 +1 @@
+1
diff --git
a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-stderr.txt
b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-stderr.txt
new file mode 100644
index 000
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4374-g803fd65
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 803fd65ef2f5d7b841cc4c4ef66acbf1164f80cd (commit)
via 59f11d3871e803cfc5a4d79d0634eaf342468b8f (commit)
from 7d1bdc4634f7846c1c716883c45f4e506f6377fe (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=803fd65ef2f5d7b841cc4c4ef66acbf1164f80cd
commit 803fd65ef2f5d7b841cc4c4ef66acbf1164f80cd
Merge: 7d1bdc4 59f11d3
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Sep 30 17:33:23 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 30 17:33:23 2013 -0400
Merge topic 'FindGTK2-targets' into next
59f11d3 FindGTK2.cmake: Change extra includes - optional and remove warning
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59f11d3871e803cfc5a4d79d0634eaf342468b8f
commit 59f11d3871e803cfc5a4d79d0634eaf342468b8f
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Sep 30 23:32:36 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Sep 30 23:32:36 2013 +0200
FindGTK2.cmake: Change extra includes - optional and remove warning
On some version they are not required
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 8b5a897..548e63d 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -457,7 +457,7 @@ function(_GTK2_ADD_TARGET _var)
string(TOLOWER ${_var} _basename)
-cmake_parse_arguments(_${_var}
GTK2_DEPENDS;GTK2_OPTIONAL_DEPENDS;EXTRA_INCLUDES ${ARGN})
+cmake_parse_arguments(_${_var}
GTK2_DEPENDS;GTK2_OPTIONAL_DEPENDS;OPTIONAL_INCLUDES ${ARGN})
if(GTK2_${_var}_FOUND AND NOT TARGET GTK2::${_basename})
# Do not create the target if dependencies are missing
@@ -467,12 +467,6 @@ function(_GTK2_ADD_TARGET _var)
endif()
endforeach()
-foreach(_include ${_${_var}_EXTRA_INCLUDES})
-if(NOT _include)
-message(WARNING FindGTK2: ${_include} not found while
creating target GTK2::${_basename})
-endif()
-endforeach()
-
add_library(GTK2::${_basename} UNKNOWN IMPORTED)
if(GTK2_${_var}_LIBRARY_RELEASE)
@@ -501,8 +495,8 @@ function(_GTK2_ADD_TARGET _var)
_GTK2_ADD_TARGET_DEPENDS(${_var} ${_${_var}_GTK2_DEPENDS}
${_${_var}_GTK2_OPTIONAL_DEPENDS})
endif()
-if(_${_var}_EXTRA_INCLUDES)
-_GTK2_ADD_TARGET_INCLUDE_DIRS(${_var} ${_${_var}_EXTRA_INCLUDES})
+if(_${_var}_OPTIONAL_INCLUDES)
+_GTK2_ADD_TARGET_INCLUDE_DIRS(${_var}
${_${_var}_OPTIONAL_INCLUDES})
endif()
if(GTK2_USE_IMPORTED_TARGETS)
@@ -644,11 +638,11 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY(PANGOFT2 pangoft2 false true)
_GTK2_ADD_TARGET (PANGOFT2 GTK2_DEPENDS pango gobject glib
-EXTRA_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
_GTK2_FIND_LIBRARY(PANGOXFT pangoxft false true)
_GTK2_ADD_TARGET (PANGOXFT GTK2_DEPENDS pangoft2 pango gobject
glib
-EXTRA_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
_GTK2_FIND_INCLUDE_DIR(GDK gdk/gdk.h)
_GTK2_FIND_INCLUDE_DIR(GDKCONFIG gdkconfig.h)
@@ -696,14 +690,14 @@ 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++
- EXTRA_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
+ OPTIONAL_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build} ${FREETYPE_INCLUDE_DIR_freetype2})
_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 pangocairo sigc++
pango cairo gobject glib
GTK2_OPTIONAL_DEPENDS cairomm
- EXTRA_INCLUDES
${FREETYPE_INCLUDE_DIR_ft2build
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4376-gcd5d958
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 cd5d958fcfd904bc33a4673009fd066f92c457ee (commit)
via 962220a220477574820223d1db1fdf0fbcc34279 (commit)
from 803fd65ef2f5d7b841cc4c4ef66acbf1164f80cd (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=cd5d958fcfd904bc33a4673009fd066f92c457ee
commit cd5d958fcfd904bc33a4673009fd066f92c457ee
Merge: 803fd65 962220a
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Sep 30 17:44:55 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 30 17:44:55 2013 -0400
Merge topic 'FindGTK2-targets' into next
962220a FindGTK2: Run tests if target was created
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=962220a220477574820223d1db1fdf0fbcc34279
commit 962220a220477574820223d1db1fdf0fbcc34279
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Sep 30 23:44:32 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Sep 30 23:44:32 2013 +0200
FindGTK2: Run tests if target was created
diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index 5b16297..1c5987c 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
# Test GTK2 targets
-if(GTK2_GLIB_FOUND)
+if(TARGET GTK2::glib)
add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/glib
@@ -43,7 +43,7 @@ if(GTK2_GLIB_FOUND)
)
endif()
-if(GTK2_GOBJECT_FOUND)
+if(TARGET GTK2::gobject)
add_test(GTK2Targets.gobject ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gobject
@@ -56,7 +56,7 @@ if(GTK2_GOBJECT_FOUND)
)
endif()
-if(GTK2_GIO_FOUND)
+if(TARGET GTK2::gio)
add_test(GTK2Targets.gio ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gio
@@ -69,7 +69,7 @@ if(GTK2_GIO_FOUND)
)
endif()
-if(GTK2_GMODULE_FOUND)
+if(TARGET GTK2::gmodule)
add_test(GTK2Targets.gmodule ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gmodule
@@ -82,7 +82,7 @@ if(GTK2_GMODULE_FOUND)
)
endif()
-if(GTK2_GTHREAD_FOUND)
+if(TARGET GTK2::gthread)
add_test(GTK2Targets.gthread ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gthread
@@ -95,7 +95,7 @@ if(GTK2_GTHREAD_FOUND)
)
endif()
-if(GTK2_ATK_FOUND)
+if(TARGET GTK2::atk)
add_test(GTK2Targets.atk ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/atk
@@ -108,7 +108,7 @@ if(GTK2_ATK_FOUND)
)
endif()
-if(GTK2_GDK_PIXBUF_FOUND)
+if(TARGET GTK2::gdk_pixbuf)
add_test(GTK2Targets.gdk_pixbuf ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gdk_pixbuf
@@ -121,7 +121,7 @@ if(GTK2_GDK_PIXBUF_FOUND)
)
endif()
-if(GTK2_CAIRO_FOUND)
+if(TARGET GTK2::cairo)
add_test(GTK2Targets.cairo ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/cairo
@@ -134,7 +134,7 @@ if(GTK2_CAIRO_FOUND)
)
endif()
-if(GTK2_PANGO_FOUND)
+if(TARGET GTK2::pango)
add_test(GTK2Targets.pango ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/pango
@@ -147,7 +147,7 @@ if(GTK2_PANGO_FOUND)
)
endif()
-if(GTK2_PANGOCAIRO_FOUND)
+if(TARGET GTK2::pangocairo)
add_test(GTK2Targets.pangocairo ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/pangocairo
@@ -160,7 +160,7 @@ if(GTK2_PANGOCAIRO_FOUND)
)
endif()
-if(GTK2_PANGOXFT_FOUND)
+if(TARGET GTK2::pangoxft)
add_test(GTK2Targets.pangoxft ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/pangoxft
@@ -173,7 +173,7 @@ if(GTK2_PANGOXFT_FOUND)
)
endif()
-if(GTK2_PANGOFT2_FOUND)
+if(TARGET GTK2::pangoft2)
add_test(GTK2Targets.pangoft2 ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/pangoft2
@@ -186,7 +186,7 @@ if(GTK2_PANGOFT2_FOUND)
)
endif()
-if(GTK2_GDK_FOUND)
+if(TARGET GTK2::gdk)
add_test(GTK2Targets.gdk ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gdk
@@ -199,7 +199,7 @@ if(GTK2_GDK_FOUND)
)
endif()
-if(GTK2_GTK_FOUND)
+if(TARGET GTK2::gtk)
add_test(GTK2Targets.gtk ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gtk
@@ -212,7 +212,7 @@ if(GTK2_GTK_FOUND)
)
endif()
-if(GTK2_SIGC++_FOUND)
+if(TARGET GTK2::sigc++)
add_test
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4348-gb6c0fbc
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 b6c0fbc490f18148dac7ade29d40f7bbf7ea9139 (commit)
via 3c594be00b5100e4bab3571502ea78c366cbe48b (commit)
from a2ca7b6f2146e04e1a260c19d62d6b0e666568f9 (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=b6c0fbc490f18148dac7ade29d40f7bbf7ea9139
commit b6c0fbc490f18148dac7ade29d40f7bbf7ea9139
Merge: a2ca7b6 3c594be
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri Sep 27 19:24:38 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Sep 27 19:24:38 2013 -0400
Merge topic 'FindGTK2-targets' into next
3c594be Revert FindGTK2: Do not add tests if the relative targets do not
exist
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c594be00b5100e4bab3571502ea78c366cbe48b
commit 3c594be00b5100e4bab3571502ea78c366cbe48b
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Sat Sep 28 01:11:36 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Sat Sep 28 01:23:52 2013 +0200
Revert FindGTK2: Do not add tests if the relative targets do not exist
This partially reverts commit e8014c6127b928d3596a85f550fbb0b6f8d34d04.
diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index 8d6b9e4..5b16297 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
# Test GTK2 targets
-if(GTK2_GLIB_FOUND AND TARGET GTK2::glib)
+if(GTK2_GLIB_FOUND)
add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/glib
@@ -43,7 +43,7 @@ if(GTK2_GLIB_FOUND AND TARGET GTK2::glib)
)
endif()
-if(GTK2_GOBJECT_FOUND AND TARGET GTK2::gobject)
+if(GTK2_GOBJECT_FOUND)
add_test(GTK2Targets.gobject ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gobject
@@ -56,7 +56,7 @@ if(GTK2_GOBJECT_FOUND AND TARGET GTK2::gobject)
)
endif()
-if(GTK2_GIO_FOUND AND TARGET GTK2::gio)
+if(GTK2_GIO_FOUND)
add_test(GTK2Targets.gio ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gio
@@ -69,7 +69,7 @@ if(GTK2_GIO_FOUND AND TARGET GTK2::gio)
)
endif()
-if(GTK2_GMODULE_FOUND AND TARGET GTK2::gmodule)
+if(GTK2_GMODULE_FOUND)
add_test(GTK2Targets.gmodule ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gmodule
@@ -82,7 +82,7 @@ if(GTK2_GMODULE_FOUND AND TARGET GTK2::gmodule)
)
endif()
-if(GTK2_GTHREAD_FOUND AND TARGET GTK2::gthread)
+if(GTK2_GTHREAD_FOUND)
add_test(GTK2Targets.gthread ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gthread
@@ -95,7 +95,7 @@ if(GTK2_GTHREAD_FOUND AND TARGET GTK2::gthread)
)
endif()
-if(GTK2_ATK_FOUND AND TARGET GTK2::atk)
+if(GTK2_ATK_FOUND)
add_test(GTK2Targets.atk ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/atk
@@ -108,7 +108,7 @@ if(GTK2_ATK_FOUND AND TARGET GTK2::atk)
)
endif()
-if(GTK2_GDK_PIXBUF_FOUND AND TARGET GTK2::gdk_pixbuf)
+if(GTK2_GDK_PIXBUF_FOUND)
add_test(GTK2Targets.gdk_pixbuf ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gdk_pixbuf
@@ -121,7 +121,7 @@ if(GTK2_GDK_PIXBUF_FOUND AND TARGET GTK2::gdk_pixbuf)
)
endif()
-if(GTK2_CAIRO_FOUND AND TARGET GTK2::cairo)
+if(GTK2_CAIRO_FOUND)
add_test(GTK2Targets.cairo ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/cairo
@@ -134,7 +134,7 @@ if(GTK2_CAIRO_FOUND AND TARGET GTK2::cairo)
)
endif()
-if(GTK2_PANGO_FOUND AND TARGET GTK2::pango)
+if(GTK2_PANGO_FOUND)
add_test(GTK2Targets.pango ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/pango
@@ -147,7 +147,7 @@ if(GTK2_PANGO_FOUND AND TARGET GTK2::pango)
)
endif()
-if(GTK2_PANGOCAIRO_FOUND AND TARGET GTK2::pangocairo)
+if(GTK2_PANGOCAIRO_FOUND)
add_test(GTK2Targets.pangocairo ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/pangocairo
@@ -160,7 +160,7 @@ if(GTK2_PANGOCAIRO_FOUND AND TARGET GTK2::pangocairo)
)
endif()
-if(GTK2_PANGOXFT_FOUND AND TARGET GTK2::pangoxft)
+if(GTK2_PANGOXFT_FOUND)
add_test(GTK2Targets.pangoxft ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/pangoxft
@@ -173,7 +173,7 @@ if(GTK2_PANGOXFT_FOUND AND TARGET GTK2::pangoxft)
)
endif()
-if(GTK2_PANGOFT2_FOUND AND TARGET GTK2::pangoft2)
+if(GTK2_PANGOFT2_FOUND
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4322-g52369f4
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 52369f40a223797f8682717de3210975d12c90ad (commit)
via 17a53c7381a324f805ad091884cd23477e633bc6 (commit)
via bb024f2117bbe7e2bd2bc17f5c30dfb51a2f3033 (commit)
from 432d10286bdc96c73a5740d6ef2e168f13d9a277 (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=52369f40a223797f8682717de3210975d12c90ad
commit 52369f40a223797f8682717de3210975d12c90ad
Merge: 432d102 17a53c7
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Sep 25 09:10:05 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 25 09:10:05 2013 -0400
Merge topic 'FindGTK2-targets' into next
17a53c7 FindGTK2: Do not use methods not available in older GTK2 version in
tests
bb024f2 FindGTK2: do not skip target creation if optional dependencies are
not found
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a53c7381a324f805ad091884cd23477e633bc6
commit 17a53c7381a324f805ad091884cd23477e633bc6
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Sep 25 15:07:30 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Sep 25 15:07:30 2013 +0200
FindGTK2: Do not use methods not available in older GTK2 version in tests
diff --git a/Tests/FindGTK2/atk/main.c b/Tests/FindGTK2/atk/main.c
index 573a313..e25030e 100644
--- a/Tests/FindGTK2/atk/main.c
+++ b/Tests/FindGTK2/atk/main.c
@@ -2,8 +2,6 @@
int main(int argc, char *argv[])
{
-guint major = atk_get_major_version();
-guint minor = atk_get_minor_version();
-guint micro = atk_get_micro_version();
+const gchar *name = atk_get_toolkit_name();
return 0;
}
diff --git a/Tests/FindGTK2/glibmm/main.cpp b/Tests/FindGTK2/glibmm/main.cpp
index 973a22a..0e8cdae 100644
--- a/Tests/FindGTK2/glibmm/main.cpp
+++ b/Tests/FindGTK2/glibmm/main.cpp
@@ -1,84 +1,7 @@
-// Taken from
https://developer.gnome.org/glibmm/unstable/thread_2thread_8cc-example.html
-
-
-#include iostream
-#include queue
-#include glibmm/threads.h
-#include glibmm/random.h
-#include glibmm/timer.h
#include glibmm/init.h
-namespace
-{
-class MessageQueue
-{
-public:
-MessageQueue();
-~MessageQueue();
-void producer();
-void consumer();
-private:
-Glib::Threads::Mutex mutex_;
-Glib::Threads::Cond cond_push_;
-Glib::Threads::Cond cond_pop_;
-std::queueint queue_;
-};
-MessageQueue::MessageQueue()
-{}
-MessageQueue::~MessageQueue()
-{}
-void MessageQueue::producer()
-{
-Glib::Rand rand (1234);
-for(int i = 0; i 200; ++i)
-{
-{
-Glib::Threads::Mutex::Lock lock (mutex_);
-while(queue_.size() = 64)
-cond_pop_.wait(mutex_);
-queue_.push(i);
-std::cout '*';
-std::cout.flush();
-cond_push_.signal();
-}
-if(rand.get_bool())
-continue;
-Glib::usleep(rand.get_int_range(0, 10));
-}
-}
-void MessageQueue::consumer()
-{
-Glib::Rand rand (4567);
-for(;;)
-{
-{
-Glib::Threads::Mutex::Lock lock (mutex_);
-while(queue_.empty())
-cond_push_.wait(mutex_);
-const int i = queue_.front();
-queue_.pop();
-std::cout \x08 \x08;
-std::cout.flush();
-cond_pop_.signal();
-if(i = 199)
-break;
-}
-if(rand.get_bool())
-continue;
-Glib::usleep(rand.get_int_range(1, 20));
-}
-}
-}
int main(int, char**)
{
Glib::init();
-MessageQueue queue;
-Glib::Threads::Thread *const producer = Glib::Threads::Thread::create(
-sigc::mem_fun(queue, MessageQueue::producer));
-Glib::Threads::Thread *const consumer = Glib::Threads::Thread::create(
-sigc::mem_fun(queue, MessageQueue::consumer));
-producer-join();
-consumer-join();
-std::cout std::endl;
return 0;
}
diff --git a/Tests/FindGTK2/gthread/main.c b/Tests/FindGTK2/gthread/main.c
index cf470ac..ce68cbd 100644
--- a/Tests/FindGTK2/gthread/main.c
+++ b/Tests/FindGTK2/gthread/main.c
@@ -1,13 +1,7 @@
#include glib.h
-gpointer func(gpointer data) {
-return NULL;
-}
-
int main(int argc, char *argv[])
{
g_thread_init(NULL);
-GThread *thread = g_thread_new(thread, func, NULL);
-g_thread_join(thread);
return 0;
}
diff --git a/Tests/FindGTK2/pango/main.c b/Tests/FindGTK2/pango/main.c
index 3e6ea05..ef87ce4 100644
--- a/Tests/FindGTK2/pango/main.c
+++ b/Tests
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4278-g503b63e
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 503b63ed9bb8edf3c357e65081b0ee3f2397900e (commit)
via 27d4a6a082a54904c344b1f2b29727053959289a (commit)
via e8014c6127b928d3596a85f550fbb0b6f8d34d04 (commit)
via b64a82121ff06b0a9dd9a9b464de8ae420efe9b2 (commit)
from adcf418e07466d89c6501d553ed9e4aeaccde2f7 (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=503b63ed9bb8edf3c357e65081b0ee3f2397900e
commit 503b63ed9bb8edf3c357e65081b0ee3f2397900e
Merge: adcf418 27d4a6a
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Sep 23 10:04:29 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 23 10:04:29 2013 -0400
Merge topic 'FindGTK2-targets' into next
27d4a6a FindGTK2: pangocairo test should link to libm (for cos() method)
e8014c6 FindGTK2: Do not add tests if the relative targets do not exist
b64a821 FindGTK2: Refactor _GTK2_ADJUST_LIB_VARS into _GTK2_ADD_TARGET
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27d4a6a082a54904c344b1f2b29727053959289a
commit 27d4a6a082a54904c344b1f2b29727053959289a
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Sep 23 15:37:29 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Sep 23 15:56:10 2013 +0200
FindGTK2: pangocairo test should link to libm (for cos() method)
diff --git a/Tests/FindGTK2/pangocairo/CMakeLists.txt
b/Tests/FindGTK2/pangocairo/CMakeLists.txt
index 68c85a4..9ac5ef0 100644
--- a/Tests/FindGTK2/pangocairo/CMakeLists.txt
+++ b/Tests/FindGTK2/pangocairo/CMakeLists.txt
@@ -7,4 +7,4 @@ find_package(GTK2 COMPONENTS gtk REQUIRED)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(pangocairo WIN32 main.c)
-target_link_libraries(pangocairo GTK2::pangocairo)
+target_link_libraries(pangocairo GTK2::pangocairo m)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8014c6127b928d3596a85f550fbb0b6f8d34d04
commit e8014c6127b928d3596a85f550fbb0b6f8d34d04
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Sep 23 15:36:21 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Sep 23 15:56:10 2013 +0200
FindGTK2: Do not add tests if the relative targets do not exist
diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index 01f73e1..8d6b9e4 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -1,6 +1,36 @@
find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
-if(GTK2_GLIB_FOUND)
+
+# Test GTK2 components
+if(GTK2_GTK_FOUND)
+ add_test(GTK2Components.gtk ${CMAKE_CTEST_COMMAND}
+--build-and-test
+${CMake_SOURCE_DIR}/Tests/FindGTK2/gtk
+${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk
+ ${build_generator_args}
+--build-target gtk-all-libs
+--build-exe-dir ${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtk
+--force-new-ctest-process
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endif()
+
+if(GTK2_GTKMM_FOUND)
+ add_test(GTK2Components.gtkmm ${CMAKE_CTEST_COMMAND}
+--build-and-test
+${CMake_SOURCE_DIR}/Tests/FindGTK2/gtkmm
+${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm
+ ${build_generator_args}
+--build-target gtkmm-all-libs
+--build-exe-dir ${CMake_BINARY_DIR}/Tests/FindGTK2/GTK2Components/gtkmm
+--force-new-ctest-process
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endif()
+
+
+# Test GTK2 targets
+if(GTK2_GLIB_FOUND AND TARGET GTK2::glib)
add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/glib
@@ -13,7 +43,7 @@ if(GTK2_GLIB_FOUND)
)
endif()
-if(GTK2_GOBJECT_FOUND)
+if(GTK2_GOBJECT_FOUND AND TARGET GTK2::gobject)
add_test(GTK2Targets.gobject ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gobject
@@ -26,7 +56,7 @@ if(GTK2_GOBJECT_FOUND)
)
endif()
-if(GTK2_GIO_FOUND)
+if(GTK2_GIO_FOUND AND TARGET GTK2::gio)
add_test(GTK2Targets.gio ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gio
@@ -39,7 +69,7 @@ if(GTK2_GIO_FOUND)
)
endif()
-if(GTK2_GMODULE_FOUND)
+if(GTK2_GMODULE_FOUND AND TARGET GTK2::gmodule)
add_test(GTK2Targets.gmodule ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/FindGTK2/gmodule
@@ -52,7 +82,7 @@ if(GTK2_GMODULE_FOUND)
)
endif()
-if(GTK2_GTHREAD_FOUND)
+if(GTK2_GTHREAD_FOUND AND TARGET GTK2::gthread)
add_test(GTK2Targets.gthread ${CMAKE_CTEST_COMMAND
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4222-gd8eb482
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 d8eb48206fdf0c9fb1588cae354dff0f734c (commit)
via 9ed99f7632aaf7520990791797e7c43d2f571ef8 (commit)
via 47655c4a84d1bc825b6ac6992e33ba8a9a8e3dfc (commit)
via 1e7d2b8332cef0984a4a988906748d3db92a4990 (commit)
from cfacea8b7c3b7f8f2bbe3e999ed57793d9b902d9 (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=d8eb48206fdf0c9fb1588cae354dff0f734c
commit d8eb48206fdf0c9fb1588cae354dff0f734c
Merge: cfacea8 9ed99f7
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Sep 18 04:58:28 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 18 04:58:28 2013 -0400
Merge topic 'FindGTK2-targets' into next
9ed99f7 FindGTK2: Do not add freetype includes if they are not found
47655c4 FindGTK2: Add libraries to the GTK2_LIBRARIES variable only when
found
1e7d2b8 FindGTK2: Build tests in separate directories
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ed99f7632aaf7520990791797e7c43d2f571ef8
commit 9ed99f7632aaf7520990791797e7c43d2f571ef8
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Sep 17 16:49:26 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Sep 17 16:50:20 2013 +0200
FindGTK2: Do not add freetype includes if they are not found
On some older system they are not required
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 2108e7e..2f84cb3 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -481,7 +481,9 @@ function(_GTK2_ADD_TARGET_INCLUDE_DIRS _var)
if(TARGET GTK2::${_basename})
foreach(_include ${ARGN})
-set_property(TARGET GTK2::${_basename} APPEND PROPERTY
INTERFACE_INCLUDE_DIRECTORIES ${_include})
+if(${_include})
+set_property(TARGET GTK2::${_basename} APPEND PROPERTY
INTERFACE_INCLUDE_DIRECTORIES ${_include})
+endif()
endforeach()
endif()
endfunction()
@@ -571,7 +573,9 @@ endif()
#
find_package(Freetype QUIET)
-list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_ft2build}
${FREETYPE_INCLUDE_DIR_freetype2})
+if(${FREETYPE_INCLUDE_DIR_ft2build} AND ${FREETYPE_INCLUDE_DIR_freetype2})
+list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_ft2build}
${FREETYPE_INCLUDE_DIR_freetype2})
+endif()
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
if(_GTK2_component STREQUAL gtk)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47655c4a84d1bc825b6ac6992e33ba8a9a8e3dfc
commit 47655c4a84d1bc825b6ac6992e33ba8a9a8e3dfc
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Sep 17 15:04:45 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Sep 17 16:50:13 2013 +0200
FindGTK2: Add libraries to the GTK2_LIBRARIES variable only when found
Some libraries (e.g. gio) are not necessary, and often not available
with older GTK2 versions, therefore GTK_LIBRARIES should not contain
GTK2_XXX-NOT_FOUND for these libraries.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index a9f0d6e..2108e7e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -370,8 +370,10 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc
_append_version)
set(GTK2_${_var}_LIBRARY ${GTK2_${_var}_LIBRARY} PARENT_SCOPE)
set(GTK2_${_var}_FOUND ${GTK2_${_var}_FOUND} PARENT_SCOPE)
-set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${GTK2_${_var}_LIBRARY})
-set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE)
+if(GTK2_${_var}_FOUND)
+set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${GTK2_${_var}_LIBRARY})
+set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE)
+endif()
if(GTK2_DEBUG)
message(STATUS [FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}]
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e7d2b8332cef0984a4a988906748d3db92a4990
commit 1e7d2b8332cef0984a4a988906748d3db92a4990
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Sep 17 12:32:30 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Sep 17 16:50:05 2013 +0200
FindGTK2: Build tests in separate directories
This should fix the tests failing when running in parallel
diff --git a/Tests/FindGTK2/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
index f9470d3..01f73e1 100644
--- a/Tests/FindGTK2/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -4,10 +4,10 @@ if(GTK2_GLIB_FOUND)
add_test
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4224-g92ed459
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 92ed4595d3627c6499143ebef7efc0de396a8c44 (commit)
via b22e337cb644874db2c892b9b08b07870f1abc3e (commit)
from d8eb48206fdf0c9fb1588cae354dff0f734c (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=92ed4595d3627c6499143ebef7efc0de396a8c44
commit 92ed4595d3627c6499143ebef7efc0de396a8c44
Merge: d8eb482 b22e337
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Sep 18 04:59:57 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Sep 18 04:59:57 2013 -0400
Merge topic 'FindGTK2-targets' into next
b22e337 Revert FindGTK2: Fail if freetype include directories are not
found
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b22e337cb644874db2c892b9b08b07870f1abc3e
commit b22e337cb644874db2c892b9b08b07870f1abc3e
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Sep 18 10:59:09 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Sep 18 10:59:09 2013 +0200
Revert FindGTK2: Fail if freetype include directories are not found
This reverts commit 7de465b7ef3aa61846d9c949357373058820614d.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 2f84cb3..37a70e4 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -766,9 +766,6 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
GTK2_GLIB_INCLUDE_DIR
GTK2_GLIBCONFIG_INCLUDE_DIR
GTK2_GLIB_LIBRARY
-
-FREETYPE_INCLUDE_DIR_ft2build
-FREETYPE_INCLUDE_DIR_freetype2
)
elseif(_GTK2_component STREQUAL gtkmm)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} Some or
all of the gtkmm libraries were not found.
---
Summary of changes:
Modules/FindGTK2.cmake |3 ---
1 files changed, 0 insertions(+), 3 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, next, updated. v2.8.11.2-4103-ga3f2be5
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 a3f2be517cda000cd608b99cebf7f1e2b82b58a5 (commit)
via 7de465b7ef3aa61846d9c949357373058820614d (commit)
from 6ab8da837836b2d70f12882258038eac521ae5e8 (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=a3f2be517cda000cd608b99cebf7f1e2b82b58a5
commit a3f2be517cda000cd608b99cebf7f1e2b82b58a5
Merge: 6ab8da8 7de465b
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Sep 9 13:22:11 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 9 13:22:11 2013 -0400
Merge topic 'FindGTK2-targets' into next
7de465b FindGTK2: Fail if freetype include directories are not found
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7de465b7ef3aa61846d9c949357373058820614d
commit 7de465b7ef3aa61846d9c949357373058820614d
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Sep 9 19:20:51 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Sep 9 19:20:56 2013 +0200
FindGTK2: Fail if freetype include directories are not found
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 738e022..a9f0d6e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -760,6 +760,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
GTK2_GLIB_INCLUDE_DIR
GTK2_GLIBCONFIG_INCLUDE_DIR
GTK2_GLIB_LIBRARY
+
+FREETYPE_INCLUDE_DIR_ft2build
+FREETYPE_INCLUDE_DIR_freetype2
)
elseif(_GTK2_component STREQUAL gtkmm)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} Some or
all of the gtkmm libraries were not found.
---
Summary of changes:
Modules/FindGTK2.cmake |3 +++
1 files changed, 3 insertions(+), 0 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, next, updated. v2.8.11.2-4091-g719bc22
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 719bc22a69cccaba7a6d788cb98b68925e798f76 (commit)
via f97c7a0aa2a2f64d0c04cf56030e72dac8997a2c (commit)
via 286dc0afbf36883d4f6c5091ccb18707d8477a69 (commit)
via cecc70aa3a932f98a95851182661457ef92e2c9f (commit)
via f9249f6871b37ab512b1a02135a6707784e151ec (commit)
via e71ebb6e13a06a9d068a04263c2a645474dc1fe8 (commit)
via a8b190b3dd00628adfc5e050d78239a399bfb3c7 (commit)
from 6c91d8df6106403fe6100edb738621deb184e854 (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=719bc22a69cccaba7a6d788cb98b68925e798f76
commit 719bc22a69cccaba7a6d788cb98b68925e798f76
Merge: 6c91d8d f97c7a0
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri Sep 6 10:04:23 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Sep 6 10:04:23 2013 -0400
Merge topic 'FindGTK2-targets' into next
f97c7a0 Merge topic 'FindGTK2-quiet' into FindGTK2-targets
286dc0a FindGTK2: Rename directory for unit tests
cecc70a FindGTK2: Add test for components using variables
f9249f6 FindGTK2: Do not link libfreetype
e71ebb6 FindGTK2: Add config directories only if different from include ones
a8b190b FindGTK2: Set INTERFACE_COMPILE_DEFINITIONS target property only if
not empty
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f97c7a0aa2a2f64d0c04cf56030e72dac8997a2c
commit f97c7a0aa2a2f64d0c04cf56030e72dac8997a2c
Merge: 286dc0a ac92d75
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Sep 6 16:03:14 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Sep 6 16:03:14 2013 +0200
Merge topic 'FindGTK2-quiet' into FindGTK2-targets
Conflicts:
Modules/FindGTK2.cmake
diff --cc Modules/FindGTK2.cmake
index 6140be9,316a2da..738e022
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@@ -243,9 -240,10 +243,10 @@@ function(_GTK2_FIND_INCLUDE_DIR _var _h
PATH_SUFFIXES
${_suffixes}
)
+ mark_as_advanced(GTK2_${_var}_INCLUDE_DIR)
-if(${_var}_INCLUDE_DIR)
-set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR}
PARENT_SCOPE)
+if(GTK2_${_var}_INCLUDE_DIR)
+set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS}
${GTK2_${_var}_INCLUDE_DIR} PARENT_SCOPE)
endif()
endfunction()
@@@ -567,8 -450,9 +568,8 @@@ endif(
# Find all components
#
- find_package(Freetype)
+ find_package(Freetype QUIET)
-list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
-list(APPEND GTK2_LIBRARIES ${FREETYPE_LIBRARIES})
+list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR_ft2build}
${FREETYPE_INCLUDE_DIR_freetype2})
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
if(_GTK2_component STREQUAL gtk)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=286dc0afbf36883d4f6c5091ccb18707d8477a69
commit 286dc0afbf36883d4f6c5091ccb18707d8477a69
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Sep 6 15:13:15 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Sep 6 15:53:44 2013 +0200
FindGTK2: Rename directory for unit tests
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 993a826..7e41656 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1071,7 +1071,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
find_package(GTK2 QUIET)
if(GTK2_FOUND)
-add_subdirectory(GTK2Targets)
+add_subdirectory(FindGTK2)
endif()
add_test(ExternalProject ${CMAKE_CTEST_COMMAND}
diff --git a/Tests/GTK2Targets/CMakeLists.txt b/Tests/FindGTK2/CMakeLists.txt
similarity index 59%
rename from Tests/GTK2Targets/CMakeLists.txt
rename to Tests/FindGTK2/CMakeLists.txt
index 154ff92..f9470d3 100644
--- a/Tests/GTK2Targets/CMakeLists.txt
+++ b/Tests/FindGTK2/CMakeLists.txt
@@ -3,11 +3,11 @@ find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
if(GTK2_GLIB_FOUND)
add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
--build-and-test
-${CMake_SOURCE_DIR}/Tests/GTK2Targets/glib
-${CMake_BINARY_DIR}/Tests/GTK2Targets/glib
+${CMake_SOURCE_DIR}/Tests/FindGTK2/glib
+${CMake_BINARY_DIR}/Tests/FindGTK2/glib
${build_generator_args}
--build-project glib
---build-exe-dir ${CMake_BINARY_DIR}/Tests/GTK2Targets/glib
+--build-exe-dir ${CMake_BINARY_DIR}/Tests/FindGTK2/glib
--force-new-ctest-process
--test-command ${CMAKE_CTEST_COMMAND} -V
)
@@ -16,11 +16,11
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4071-g26a4558
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 26a455840b3b40179314c50b0d04c31002cd34ee (commit)
via ac92d75c21470abaad042b43e4972733dfba76c5 (commit)
from 7a9a80fc9a574964a9df6470a173a8a1798d5f3a (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=26a455840b3b40179314c50b0d04c31002cd34ee
commit 26a455840b3b40179314c50b0d04c31002cd34ee
Merge: 7a9a80f ac92d75
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Tue Sep 3 09:12:47 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 3 09:12:47 2013 -0400
Merge topic 'FindGTK2-quiet' into next
ac92d75 FindGTK2: Fix commit 1e18051f687836052479b70f28c520a5e0626dd7
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac92d75c21470abaad042b43e4972733dfba76c5
commit ac92d75c21470abaad042b43e4972733dfba76c5
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Sep 3 15:09:17 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Sep 3 15:09:17 2013 +0200
FindGTK2: Fix commit 1e18051f687836052479b70f28c520a5e0626dd7
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 8ad0b51..316a2da 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -587,7 +587,7 @@
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
string(TOUPPER ${_GTK2_component} _COMPONENT_UPPER)
-set(GTK2_${_COMPONENT_UPPER}_FIND_QUIETLY GTK2_FIND_QUIETLY)
+set(GTK2_${_COMPONENT_UPPER}_FIND_QUIETLY ${GTK2_FIND_QUIETLY})
if(_GTK2_component STREQUAL gtk)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} Some or
all of the gtk libraries were not found.
---
Summary of changes:
Modules/FindGTK2.cmake |2 +-
1 files changed, 1 insertions(+), 1 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, next, updated. v2.8.11.2-3824-gfdc4d43
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 fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62 (commit)
via 1e18051f687836052479b70f28c520a5e0626dd7 (commit)
via 87d1044a9ddda419b9779c54ab112d66b736 (commit)
via 53265aa79904ec0b753776fe86656a1117cce74a (commit)
from ffc7a0bb79fdf71c89bc6f10089406abda259379 (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=fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62
commit fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62
Merge: ffc7a0b 1e18051
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri Aug 9 10:56:30 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Aug 9 10:56:30 2013 -0400
Merge topic 'FindGTK2-quiet' into next
1e18051 FindGTK2: Search for modules quietly when needed
87d FindGTK2: Find freetype quietly
53265aa FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced
diff --cc Modules/FindGTK2.cmake
index d5b0f35,8ad0b51..05b13fd
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@@ -241,9 -240,10 +241,10 @@@ function(_GTK2_FIND_INCLUDE_DIR _var _h
PATH_SUFFIXES
${_suffixes}
)
+ mark_as_advanced(GTK2_${_var}_INCLUDE_DIR)
-if(${_var}_INCLUDE_DIR)
-set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR}
PARENT_SCOPE)
+if(GTK2_${_var}_INCLUDE_DIR)
+set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS}
${GTK2_${_var}_INCLUDE_DIR} PARENT_SCOPE)
endif()
endfunction()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e18051f687836052479b70f28c520a5e0626dd7
commit 1e18051f687836052479b70f28c520a5e0626dd7
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Aug 9 15:37:52 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Search for modules quietly when needed
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 6147361..8ad0b51 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -587,6 +587,8 @@
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
string(TOUPPER ${_GTK2_component} _COMPONENT_UPPER)
+set(GTK2_${_COMPONENT_UPPER}_FIND_QUIETLY GTK2_FIND_QUIETLY)
+
if(_GTK2_component STREQUAL gtk)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} Some or
all of the gtk libraries were not found.
GTK2_GTK_LIBRARY
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87d1044a9ddda419b9779c54ab112d66b736
commit 87d1044a9ddda419b9779c54ab112d66b736
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Aug 9 10:55:48 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Find freetype quietly
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index b604657..6147361 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -450,7 +450,7 @@ endif()
# Find all components
#
-find_package(Freetype)
+find_package(Freetype QUIET)
list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
list(APPEND GTK2_LIBRARIES ${FREETYPE_LIBRARIES})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53265aa79904ec0b753776fe86656a1117cce74a
commit 53265aa79904ec0b753776fe86656a1117cce74a
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Aug 9 11:07:07 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Aug 9 16:55:08 2013 +0200
FindGTK2: Mark GTK_*_INCLUDE_DIR as advanced
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 77aac6d..b604657 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -240,6 +240,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
PATH_SUFFIXES
${_suffixes}
)
+mark_as_advanced(GTK2_${_var}_INCLUDE_DIR)
if(${_var}_INCLUDE_DIR)
set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR}
PARENT_SCOPE)
---
Summary of changes:
Modules/FindGTK2.cmake |5 -
1 files changed, 4 insertions(+), 1 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, next, updated. v2.8.11.2-3829-gcaec092
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 caec09261ace95094b47ffbf775984d58fd6837b (commit)
via d3466549b9e4d34784a640719dee88829feacc43 (commit)
via 44e7ca4a82336d41d45ba39d553d1b767901b581 (commit)
via a59c96d21880bad01a9fbd926e6d52e36c28ce76 (commit)
via 7316bc897124c8c77eb4f0a24966dae83993a8ca (commit)
from fdc4d4385353a2bd387fe5a80ac8b440b7fc3e62 (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=caec09261ace95094b47ffbf775984d58fd6837b
commit caec09261ace95094b47ffbf775984d58fd6837b
Merge: fdc4d43 d346654
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Fri Aug 9 10:58:41 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Aug 9 10:58:41 2013 -0400
Merge topic 'FindGTK2-targets' into next
d346654 FindGTK2: Add unit tests for all targets in gtk and gtkmm modules
44e7ca4 FindGTK2: Add check to ensure that target exists
a59c96d FindGTK2: Fix gmodule, glibmm, pangoft2, and pangoxft targets
7316bc8 FindGTK2: Link freetype libs to targets including freetype includes
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3466549b9e4d34784a640719dee88829feacc43
commit d3466549b9e4d34784a640719dee88829feacc43
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Aug 9 16:39:26 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Aug 9 16:53:22 2013 +0200
FindGTK2: Add unit tests for all targets in gtk and gtkmm modules
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d6d328b..993a826 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1069,34 +1069,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
endif()
endif()
- if(NOT GTK2_FOUND)
-find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
- endif()
-
- if(GTK2_GTK_FOUND)
- add_test(GTK2Gtk ${CMAKE_CTEST_COMMAND}
- --build-and-test
- ${CMake_SOURCE_DIR}/Tests/GTK2Gtk
- ${CMake_BINARY_DIR}/Tests/GTK2Gtk
- ${build_generator_args}
- --build-project GTK2Gtk
- --build-exe-dir ${CMake_BINARY_DIR}/Tests/GTK2Gtk
- --force-new-ctest-process
- --test-command ${CMAKE_CTEST_COMMAND} -V
- )
- endif()
-
- if(GTK2_GTKMM_FOUND)
- add_test(GTK2GtkMM ${CMAKE_CTEST_COMMAND}
- --build-and-test
- ${CMake_SOURCE_DIR}/Tests/GTK2GtkMM
- ${CMake_BINARY_DIR}/Tests/GTK2GtkMM
-${build_generator_args}
- --build-project GTK2GtkMM
- --build-exe-dir ${CMake_BINARY_DIR}/Tests/GTK2GtkMM
- --force-new-ctest-process
- --test-command ${CMAKE_CTEST_COMMAND} -V
- )
+ find_package(GTK2 QUIET)
+ if(GTK2_FOUND)
+add_subdirectory(GTK2Targets)
endif()
add_test(ExternalProject ${CMAKE_CTEST_COMMAND}
diff --git a/Tests/GTK2GtkMM/CMakeLists.txt b/Tests/GTK2GtkMM/CMakeLists.txt
deleted file mode 100644
index 017f884..000
--- a/Tests/GTK2GtkMM/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(GTK2GtkMM)
-
-find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-add_executable(GTK2GtkMM WIN32 main.cpp helloworld.cpp helloworld.h)
-target_link_libraries(GTK2GtkMM GTK2::gtkmm)
diff --git a/Tests/GTK2Targets/CMakeLists.txt b/Tests/GTK2Targets/CMakeLists.txt
new file mode 100644
index 000..ada25ec
--- /dev/null
+++ b/Tests/GTK2Targets/CMakeLists.txt
@@ -0,0 +1,287 @@
+find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
+
+if(GTK2_GLIB_FOUND)
+ add_test(GTK2Targets.glib ${CMAKE_CTEST_COMMAND}
+--build-and-test
+${CMake_SOURCE_DIR}/Tests/GTK2Targets/glib
+${CMake_BINARY_DIR}/Tests/GTK2Targets/glib
+${build_generator_args}
+--build-project glib
+--build-exe-dir ${CMake_BINARY_DIR}/Tests/GTK2Targets/glib
+--force-new-ctest-process
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endif()
+
+if(GTK2_GOBJECT_FOUND)
+ add_test(GTK2Targets.gobject ${CMAKE_CTEST_COMMAND}
+--build-and-test
+${CMake_SOURCE_DIR}/Tests/GTK2Targets/gobject
+${CMake_BINARY_DIR}/Tests/GTK2Targets/gobject
+${build_generator_args}
+--build-project gobject
+--build-exe-dir ${CMake_BINARY_DIR}/Tests/GTK2Targets/gobject
+--force-new-ctest-process
+--test-command ${CMAKE_CTEST_COMMAND} -V
+)
+endif()
+
+if(GTK2_GIO_FOUND)
+ add_test(GTK2Targets.gio ${CMAKE_CTEST_COMMAND}
+--build-and-test
+${CMake_SOURCE_DIR}/Tests/GTK2Targets/gio
+${CMake_BINARY_DIR}/Tests/GTK2Targets/gio
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3767-g4532f68
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 4532f68df85fc1ee5083029de8cd26af0c984370 (commit)
via 893c5c1befd317473ac294f4998ec6d02198ddb0 (commit)
via e3003f65664f5171b9dc5abc219bc3d2dce9d4c1 (commit)
via 8442a39775cb392485c27636fcc0877cce7ca01b (commit)
via 7c3adb07986c24b8081558b2cd807f30a3b7e01d (commit)
via ab5f03d730aaa3c658bff0d3c82008da8037bc7f (commit)
via eeecbe65401e4600fa9a8f3ba10abea68d1b6a9b (commit)
via ed14da39c51bc6cc6efc1551e0c55679798fde5f (commit)
via fc3b60dfbb4b9525662b3301ecb547d025e04ee8 (commit)
from dfbc7873da9ef0e5ec0267d20de7bdf41f12b54f (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=4532f68df85fc1ee5083029de8cd26af0c984370
commit 4532f68df85fc1ee5083029de8cd26af0c984370
Merge: dfbc787 893c5c1
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Aug 7 12:55:59 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Aug 7 12:55:59 2013 -0400
Merge topic 'FindGTK2-targets' into next
893c5c1 FindGTK2: Add unit tests for gtk and gtkmm targets
e3003f6 FindGTK2: Small cleanup
8442a39 FindGTK2: Do not require the GTK_ prefix in all the internal
functions
7c3adb0 FindGTK2: Better handling of include directories
ab5f03d FindGTK2: Create targets for each library
eeecbe6 FindGTK2: Search for glib-object.h instead of gobject/gobject.h
ed14da3 FindGTK2: Populate GTK2_DEFINITIONS before searching for libraries
fc3b60d FindGTK2: Export GTK2_XXX_FOUND to parent scope in
_GTK2_FIND_LIBRARY
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=893c5c1befd317473ac294f4998ec6d02198ddb0
commit 893c5c1befd317473ac294f4998ec6d02198ddb0
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Aug 6 11:33:59 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Tue Aug 6 11:33:59 2013 +0200
FindGTK2: Add unit tests for gtk and gtkmm targets
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 16693de..d6d328b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1069,6 +1069,36 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
endif()
endif()
+ if(NOT GTK2_FOUND)
+find_package(GTK2 COMPONENTS gtk glade gtkmm glademm QUIET)
+ endif()
+
+ if(GTK2_GTK_FOUND)
+ add_test(GTK2Gtk ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ ${CMake_SOURCE_DIR}/Tests/GTK2Gtk
+ ${CMake_BINARY_DIR}/Tests/GTK2Gtk
+ ${build_generator_args}
+ --build-project GTK2Gtk
+ --build-exe-dir ${CMake_BINARY_DIR}/Tests/GTK2Gtk
+ --force-new-ctest-process
+ --test-command ${CMAKE_CTEST_COMMAND} -V
+ )
+ endif()
+
+ if(GTK2_GTKMM_FOUND)
+ add_test(GTK2GtkMM ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ ${CMake_SOURCE_DIR}/Tests/GTK2GtkMM
+ ${CMake_BINARY_DIR}/Tests/GTK2GtkMM
+${build_generator_args}
+ --build-project GTK2GtkMM
+ --build-exe-dir ${CMake_BINARY_DIR}/Tests/GTK2GtkMM
+ --force-new-ctest-process
+ --test-command ${CMAKE_CTEST_COMMAND} -V
+ )
+ endif()
+
add_test(ExternalProject ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/ExternalProject
diff --git a/Tests/GTK2Gtk/CMakeLists.txt b/Tests/GTK2Gtk/CMakeLists.txt
new file mode 100644
index 000..30ab706
--- /dev/null
+++ b/Tests/GTK2Gtk/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(GTK2Gtk)
+
+find_package(GTK2 COMPONENTS gtk REQUIRED)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+add_executable(GTK2Gtk WIN32 main.c)
+target_link_libraries(GTK2Gtk GTK2::gtk)
diff --git a/Tests/GTK2Gtk/main.c b/Tests/GTK2Gtk/main.c
new file mode 100644
index 000..309c328
--- /dev/null
+++ b/Tests/GTK2Gtk/main.c
@@ -0,0 +1,15 @@
+#include gtk/gtk.h
+
+int main(int argc, char *argv[])
+{
+GtkWidget *window;
+
+gtk_init (argc, argv);
+
+window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+gtk_widget_show (window);
+
+gtk_main ();
+
+return 0;
+}
diff --git a/Tests/GTK2GtkMM/CMakeLists.txt b/Tests/GTK2GtkMM/CMakeLists.txt
new file mode 100644
index 000..017f884
--- /dev/null
+++ b/Tests/GTK2GtkMM/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(GTK2GtkMM)
+
+find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+add_executable(GTK2GtkMM WIN32 main.cpp helloworld.cpp helloworld.h)
+target_link_libraries(GTK2GtkMM GTK2::gtkmm)
diff --git
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3574-gbd1c269
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 bd1c269eba532e0b5576daa8342326b5ea3f270d (commit)
via 73ba4e5030c0c6ea40643f67622b0e0b754651c8 (commit)
from 89085f34117364031de9d17e0b22f18563680d64 (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=bd1c269eba532e0b5576daa8342326b5ea3f270d
commit bd1c269eba532e0b5576daa8342326b5ea3f270d
Merge: 89085f3 73ba4e5
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Aug 1 10:57:52 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Aug 1 10:57:52 2013 -0400
Merge topic 'FindGTK2-pango-libs' into next
73ba4e5 FindGTK2: Detect pangoft2 and pangoxft libraries
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73ba4e5030c0c6ea40643f67622b0e0b754651c8
commit 73ba4e5030c0c6ea40643f67622b0e0b754651c8
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Jul 31 18:29:16 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Thu Aug 1 16:54:32 2013 +0200
FindGTK2: Detect pangoft2 and pangoxft libraries
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index f7d3bf8..77aac6d 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -77,7 +77,7 @@
# appropriate. A new set of _RELEASE variables was also added.
# * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
# marked as advanced by SelectLibraryConfigurations
-# * Detect gmodule library
+# * Detect gmodule, pangoft2 and pangoxft libraries
# Version 1.4 (10/4/2012) (CMake 2.8.10)
# * 12596: Missing paths for FindGTK2 on NetBSD
# * 12049: Fixed detection of GTK include files in the lib folder on
@@ -478,6 +478,10 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY(GTK2_PANGOCAIRO pangocairo false true)
+_GTK2_FIND_LIBRARY(GTK2_PANGOFT2 pangoft2 false true)
+
+_GTK2_FIND_LIBRARY(GTK2_PANGOXFT pangoxft false true)
+
_GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF gdk-pixbuf/gdk-pixbuf.h)
_GTK2_FIND_LIBRARY(GTK2_GDK_PIXBUF gdk_pixbuf false true)
---
Summary of changes:
Modules/FindGTK2.cmake |6 +-
1 files changed, 5 insertions(+), 1 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, next, updated. v2.8.11.2-3548-g14668d1
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 14668d1346619005d94b3c1777acb85abb0a4a57 (commit)
via 7ca5958820b7741b251081af66e1cb67af243fd5 (commit)
via 76c72b9f14258933e4cf810da275bd2b931c5ac9 (commit)
from c57b8d5618a6dd664b932b92c9c87ccc3dbcfed4 (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=14668d1346619005d94b3c1777acb85abb0a4a57
commit 14668d1346619005d94b3c1777acb85abb0a4a57
Merge: c57b8d5 7ca5958
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Wed Jul 31 11:42:35 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Jul 31 11:42:35 2013 -0400
Merge topic 'FindGTK2-gmodule' into next
7ca5958 FindGTK2: Detect gmodule library
76c72b9 FindGTK2: gthread-2.0 folder does not exist
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ca5958820b7741b251081af66e1cb67af243fd5
commit 7ca5958820b7741b251081af66e1cb67af243fd5
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Jul 31 17:40:07 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Jul 31 17:40:07 2013 +0200
FindGTK2: Detect gmodule library
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index efb1d9f..f7d3bf8 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -77,6 +77,7 @@
# appropriate. A new set of _RELEASE variables was also added.
# * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
# marked as advanced by SelectLibraryConfigurations
+# * Detect gmodule library
# Version 1.4 (10/4/2012) (CMake 2.8.10)
# * 12596: Missing paths for FindGTK2 on NetBSD
# * 12049: Fixed detection of GTK include files in the lib folder on
@@ -482,6 +483,8 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY(GTK2_GTHREAD gthread false true)
+_GTK2_FIND_LIBRARY(GTK2_GMODULE gmodule false true)
+
_GTK2_FIND_LIBRARY(GTK2_GIO gio false true)
_GTK2_FIND_INCLUDE_DIR(GTK2_ATK atk/atk.h)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76c72b9f14258933e4cf810da275bd2b931c5ac9
commit 76c72b9f14258933e4cf810da275bd2b931c5ac9
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Wed Jul 31 17:37:46 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Jul 31 17:39:38 2013 +0200
FindGTK2: gthread-2.0 folder does not exist
Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 4f522e5..efb1d9f 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -178,7 +178,6 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
cairo
cairomm-1.0
gdk-pixbuf-2.0
-gthread-2.0
gdkmm-2.4
giomm-2.4
gtk-2.0
---
Summary of changes:
Modules/FindGTK2.cmake |4 +++-
1 files changed, 3 insertions(+), 1 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, next, updated. v2.8.11.2-3241-g2d0d213
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 2d0d2138bd1ed05a6b3522f7cb0739b2c71b190e (commit) via bcb574ef561402ef16a98197d5ccbb6d9cdf4232 (commit) from 8e30b4b6d66d274ec72022254c97f562a2463156 (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=2d0d2138bd1ed05a6b3522f7cb0739b2c71b190e commit 2d0d2138bd1ed05a6b3522f7cb0739b2c71b190e Merge: 8e30b4b bcb574e Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com AuthorDate: Fri Jul 19 06:30:34 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jul 19 06:30:34 2013 -0400 Merge topic 'SelectLibraryConfigurations' into next bcb574e [SelectLibraryConfigurations] Update unit-test with the new logic http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcb574ef561402ef16a98197d5ccbb6d9cdf4232 commit bcb574ef561402ef16a98197d5ccbb6d9cdf4232 Author: Daniele E. Domenichelli daniele.domeniche...@iit.it AuthorDate: Fri Jul 19 12:26:13 2013 +0200 Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it CommitDate: Fri Jul 19 12:26:13 2013 +0200 [SelectLibraryConfigurations] Update unit-test with the new logic diff --git a/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt b/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt index 5bf0f8a..6d1628a 100644 --- a/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt +++ b/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt @@ -29,7 +29,7 @@ if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug) endif () -check_slc(empty ) +check_slc(empty empty_LIBRARY-NOTFOUND) set(OPTONLY_LIBRARY_RELEASE opt) check_slc(OPTONLY opt) --- Summary of changes: .../SelectLibraryConfigurations/CMakeLists.txt |2 +- 1 files changed, 1 insertions(+), 1 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, next, updated. v2.8.11.2-3223-g9dd3cc6
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 9dd3cc62fd9766b561431b33852ece78a57d85aa (commit)
via 5cd32c2c74cb43a08f7483b2595e3036c02109eb (commit)
via 07b44e7a1f3facf3b4300fb98bfa0705ef728bce (commit)
from 6144dceb490a72d0d39d2ecbeec01d0bbe2cf744 (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=9dd3cc62fd9766b561431b33852ece78a57d85aa
commit 9dd3cc62fd9766b561431b33852ece78a57d85aa
Merge: 6144dce 5cd32c2
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Thu Jul 18 11:53:18 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jul 18 11:53:18 2013 -0400
Merge topic 'SelectLibraryConfigurations' into next
5cd32c2 SelectLibraryConfigurations: Use -NOTFOUND instead of copying the
vars
07b44e7 SelectLibraryConfigurations: Do not cache the _LIBRARY variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cd32c2c74cb43a08f7483b2595e3036c02109eb
commit 5cd32c2c74cb43a08f7483b2595e3036c02109eb
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Jul 8 17:37:18 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Wed Jul 10 15:21:36 2013 +0200
SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars
If one of the libraries (_DEBUG or _RELEASE) is not set, the value is
set to the value of the other one.
FindQt4, from which the macro is extracted, sets the values to
XXX_LIBRARY_{DEBUG,RELEASE}-NOTFOUND instead.
In both cases the XXX_LIBRARY is correct, but using NOTFOUND makes it
easier to understand which one is missing.
diff --git a/Modules/SelectLibraryConfigurations.cmake
b/Modules/SelectLibraryConfigurations.cmake
index f475d87..297e1d3 100644
--- a/Modules/SelectLibraryConfigurations.cmake
+++ b/Modules/SelectLibraryConfigurations.cmake
@@ -3,16 +3,18 @@
# This macro takes a library base name as an argument, and will choose good
# values for basename_LIBRARY, basename_LIBRARIES, basename_LIBRARY_DEBUG, and
# basename_LIBRARY_RELEASE depending on what has been found and set. If only
-# basename_LIBRARY_RELEASE is defined, basename_LIBRARY,
basename_LIBRARY_DEBUG,
-# and basename_LIBRARY_RELEASE will be set to the release value. If only
-# basename_LIBRARY_DEBUG is defined, then basename_LIBRARY,
-# basename_LIBRARY_DEBUG and basename_LIBRARY_RELEASE will take the debug
value.
+# basename_LIBRARY_RELEASE is defined, basename_LIBRARY will be set to the
+# release value, and basename_LIBRARY_DEBUG will be set to
+# basename_LIBRARY_DEBUG-NOTFOUND. If only basename_LIBRARY_DEBUG is defined,
+# then basename_LIBRARY will take the debug value, and basename_LIBRARY_RELEASE
+# will be set to basename_LIBRARY_RELEASE-NOTFOUND.
#
# If the generator supports configuration types, then basename_LIBRARY and
# basename_LIBRARIES will be set with debug and optimized flags specifying the
# library to be used for the given configuration. If no build type has been
set
# or the generator in use does not support configuration types, then
-# basename_LIBRARY and basename_LIBRARIES will take only the release values.
+# basename_LIBRARY and basename_LIBRARIES will take only the release value, or
+# the debug value if the release one is not set.
#=
# Copyright 2009 Will Dicharry wdicha...@stellarscience.com
@@ -31,48 +33,36 @@
# This macro was adapted from the FindQt4 CMake module and is maintained by
Will
# Dicharry wdicha...@stellarscience.com.
-# Utility macro to check if one variable exists while another doesn't, and set
-# one that doesn't exist to the one that exists.
-macro( _set_library_name basename GOOD BAD )
-if( ${basename}_LIBRARY_${GOOD} AND NOT ${basename}_LIBRARY_${BAD} )
-set( ${basename}_LIBRARY_${BAD} ${${basename}_LIBRARY_${GOOD}} )
-set( ${basename}_LIBRARY ${${basename}_LIBRARY_${GOOD}} )
-set( ${basename}_LIBRARIES ${${basename}_LIBRARY_${GOOD}} )
-endif()
-endmacro()
-
macro( select_library_configurations basename )
-# if only the release version was found, set the debug to be the release
-# version.
-_set_library_name( ${basename} RELEASE DEBUG )
-# if only the debug version was found, set the release value to be the
-# debug value.
-_set_library_name( ${basename} DEBUG RELEASE )
-
-# Set a default case, which will come into effect if
-# -no build type is set and the generator only supports one build type
-# at a time (i.e
