[Cmake-commits] CMake branch, master, updated. v3.2.2-1355-gfc01247
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via fc01247f31951c558a23af5e69b7eebe8ee73b28 (commit) from 49959d7a23a8b1261e3120643ee189869d552929 (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=fc01247f31951c558a23af5e69b7eebe8ee73b28 commit fc01247f31951c558a23af5e69b7eebe8ee73b28 Author: Kitware Robot AuthorDate: Sat May 30 00:01:06 2015 -0400 Commit: Kitware Robot CommitDate: Sat May 30 00:01:06 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 32c4ee6..99a0b69 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 2) -set(CMake_VERSION_PATCH 20150529) +set(CMake_VERSION_PATCH 20150530) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[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
AuthorDate: Fri May 29 14:04:05 2015 -0400
Commit: CMake Topic Stage
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
AuthorDate: Fri May 29 18:50:59 2015 +0200
Commit: Daniele E. Domenichelli
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()
+
+
+pkg_check_modules(FOO "${expected_path}")
+
+if(NOT FOO_FOUND)
+ mess
[Cmake-commits] CMake branch, next, updated. v3.2.2-3250-ge932b35
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 e932b3553022e6b023c40b0a207f3e16e409dd30 (commit)
via d1e4b3b68b6e948760360215b940d880cc5d6ce4 (commit)
via 028945de180d4dabb37a49264b4aecad0cb26400 (commit)
from e9c8f66b3d7800d8db5129a666dcf9849c167ed1 (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=e932b3553022e6b023c40b0a207f3e16e409dd30
commit e932b3553022e6b023c40b0a207f3e16e409dd30
Merge: e9c8f66 d1e4b3b
Author: Raffi Enficiaud
AuthorDate: Fri May 29 11:48:57 2015 -0400
Commit: CMake Topic Stage
CommitDate: Fri May 29 11:48:57 2015 -0400
Merge topic 'FindMatlab-fix-visibility-and-reconfiguration' into next
d1e4b3b6 FindMatlab: fix reconfiguration of Matlab_ROOT_DIR
028945de FindMatlab: fix header visibility of the generated mex files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1e4b3b68b6e948760360215b940d880cc5d6ce4
commit d1e4b3b68b6e948760360215b940d880cc5d6ce4
Author: Raffi Enficiaud
AuthorDate: Fri May 29 17:44:19 2015 +0200
Commit: Raffi Enficiaud
CommitDate: Fri May 29 17:44:19 2015 +0200
FindMatlab: fix reconfiguration of Matlab_ROOT_DIR
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 939f796..028bf5a 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -134,7 +134,8 @@
# returns the suffix to be used for the mex files
# (platform/architecture dependant)
# :command:`matlab_get_version_from_matlab_run`
-# returns the version of Matlab, given the full directory of the Matlab
program.
+# returns the version of Matlab, given the full directory of the Matlab
+# program.
#
#
# Known issues
@@ -1064,7 +1065,7 @@ if(Matlab_ROOT_DIR)
endif()
else()
# NOTFOUND indicates the code below to search for the version automatically
-if(NOT DEFINED Matlab_VERSION_STRING_INTERNAL)
+if("${Matlab_VERSION_STRING_INTERNAL}" STREQUAL "")
list(APPEND _matlab_possible_roots "NOTFOUND" ${Matlab_ROOT_DIR}) #
empty version
else()
list(APPEND _matlab_possible_roots ${Matlab_VERSION_STRING_INTERNAL}
${Matlab_ROOT_DIR}) # cached version
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest2-result.txt
b/Tests/RunCMake/FindMatlab/MatlabTest2-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest2-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest2-stderr.txt
b/Tests/RunCMake/FindMatlab/MatlabTest2-stderr.txt
new file mode 100644
index 000..9abb766
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest2-stderr.txt
@@ -0,0 +1 @@
+.*
\ No newline at end of file
diff --git a/Tests/RunCMake/FindMatlab/MatlabTest2.cmake
b/Tests/RunCMake/FindMatlab/MatlabTest2.cmake
new file mode 100644
index 000..d5b0e6d
--- /dev/null
+++ b/Tests/RunCMake/FindMatlab/MatlabTest2.cmake
@@ -0,0 +1,9 @@
+cmake_minimum_required (VERSION 2.8.12)
+enable_testing()
+project(findmatlab_runcmake_test2)
+
+if(NOT DEFINED matlab_required)
+ set(matlab_required REQUIRED)
+endif()
+
+find_package(Matlab ${matlab_required} COMPONENTS MX_LIBRARY)
diff --git a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
index 33dbb77..f0eb6b4 100644
--- a/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
@@ -1,3 +1,51 @@
include(RunCMake)
run_cmake(MatlabTest1)
+
+if(RunCMake_GENERATOR MATCHES "Make" AND UNIX)
+ # Use a single build tree for a few tests without cleaning.
+ set(RunCMake_TEST_BINARY_DIR
${RunCMake_BINARY_DIR}/RerunFindMatlab-build-init)
+ set(RunCMake_TEST_NO_CLEAN 1)
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+ message(STATUS "RerunFindMatlab: first configuration to extract real
Matlab_ROOT_DIR")
+ set(RunCMake_TEST_OPTIONS "-Dmatlab_required=REQUIRED")
+ run_cmake(MatlabTest2)
+
+ message(STATUS "RerunFindMatlab: flushing the variables")
+ execute_process(COMMAND
+${CMAKE_COMMAND} -L ${RunCMake_TEST_BINARY_DIR}
+RESULT_VARIABLE _MatlabTest2_error
+OUTPUT_VARIABLE _MatlabTest2_output)
+ if(NOT _MatlabTest2_error EQUAL 0)
+message(FATAL_ERROR "RerunFindMatlab: cannot list the variables ...")
+ endif()
+
+ string(REGEX MATCH "Matlab_ROOT_DIR.+=([^\r\n]+)" _matched
${_MatlabTest2_output})
+
+ set(Matlab_ROOT_DIR_correct "${CMAKE_MATCH_1}")
+ if(Matlab_ROOT_DIR_correct STREQUAL "")
+message(FATAL_ERROR "RerunFindMatlab: cannot extract Matlab_ROOT_DIR")
+ endif()
[Cmake-commits] CMake branch, next, updated. v3.2.2-3247-ge9c8f66
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 e9c8f66b3d7800d8db5129a666dcf9849c167ed1 (commit)
via a9b1838f97af5fbc377a4cceb2bb503b57ce5eb4 (commit)
via 49959d7a23a8b1261e3120643ee189869d552929 (commit)
from 9a9d15cc2be5a314e3156f2e7b2a173cc9b4f4e1 (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=e9c8f66b3d7800d8db5129a666dcf9849c167ed1
commit e9c8f66b3d7800d8db5129a666dcf9849c167ed1
Merge: 9a9d15c a9b1838
Author: Brad King
AuthorDate: Fri May 29 11:25:59 2015 -0400
Commit: CMake Topic Stage
CommitDate: Fri May 29 11:25:59 2015 -0400
Merge topic 'doc-cmake-compile-features-typo' into next
a9b1838f Help: Fix typo in cmake-compile-features(7) manual (#15594)
49959d7a CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9b1838f97af5fbc377a4cceb2bb503b57ce5eb4
commit a9b1838f97af5fbc377a4cceb2bb503b57ce5eb4
Author: Erik Sjölund
AuthorDate: Fri May 29 15:16:32 2015 +0200
Commit: Brad King
CommitDate: Fri May 29 11:23:37 2015 -0400
Help: Fix typo in cmake-compile-features(7) manual (#15594)
target_link_libraries() is being used in the example code but
target_include_directories() was probably meant to be used. The sentence
that starts with "Consuming code then" indicates that the example is
about using the appropriate include directory.
diff --git a/Help/manual/cmake-compile-features.7.rst
b/Help/manual/cmake-compile-features.7.rst
index 46a5afb..caf5bac 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -278,7 +278,7 @@ properties:
add_library(foo INTERFACE)
set(with_variadics ${CMAKE_CURRENT_SOURCE_DIR}/with_variadics)
set(no_variadics ${CMAKE_CURRENT_SOURCE_DIR}/no_variadics)
- target_link_libraries(foo
+ target_include_directories(foo
INTERFACE
"$<$:${with_variadics}>"
"$<$>:${no_variadics}>"
---
Summary of changes:
Help/manual/cmake-compile-features.7.rst |2 +-
Source/CMakeVersion.cmake|2 +-
2 files 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
