[Cmake-commits] CMake branch, master, updated. v3.15.4-1254-gec16afc
Kitware Robot
kwrobot at kitware.com
Tue Oct 1 11:12:46 EDT 2019
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 ec16afc9e8aed8aebd387c416af5b5eef4ad337a (commit)
via 7ad49fa3339dd25c53b4166a8aa12fcf59cf4dad (commit)
via ab06de68c54710136d50509833b2be937adba5c8 (commit)
via 048860e172cb08445fca19ea2e4387e5ea3cedbe (commit)
from a06472b1689b16f1e1026330d0147b528a96ac5c (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=ec16afc9e8aed8aebd387c416af5b5eef4ad337a
commit ec16afc9e8aed8aebd387c416af5b5eef4ad337a
Merge: 7ad49fa ab06de6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 1 15:03:14 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 1 11:06:22 2019 -0400
Merge topic 'typos'
ab06de68c5 Help: fixed typos in PCH / Unity Build doc
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3870
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7ad49fa3339dd25c53b4166a8aa12fcf59cf4dad
commit 7ad49fa3339dd25c53b4166a8aa12fcf59cf4dad
Merge: a06472b 048860e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 1 15:02:53 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 1 11:03:18 2019 -0400
Merge topic 'FindCurses-ncursesw'
048860e172 FindCurses: toplevel ncursesw support, recover cflags
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3845
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab06de68c54710136d50509833b2be937adba5c8
commit ab06de68c54710136d50509833b2be937adba5c8
Author: Corentin Plouet <corentin at plouet.name>
AuthorDate: Tue Oct 1 05:21:55 2019 +1000
Commit: Corentin Plouet <corentin at plouet.name>
CommitDate: Tue Oct 1 05:33:50 2019 +1000
Help: fixed typos in PCH / Unity Build doc
+ typos in source code
diff --git a/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst b/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst
index d740303..9c3e7ea 100644
--- a/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst
+++ b/Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst
@@ -1,7 +1,7 @@
PRECOMPILE_HEADERS_REUSE_FROM
-----------------------------
-Target from which to reuse the precomipled headers build artifact.
+Target from which to reuse the precompiled headers build artifact.
See the second signature of :command:`target_precompile_headers` command
for more detailed information.
diff --git a/Help/prop_tgt/UNITY_BUILD.rst b/Help/prop_tgt/UNITY_BUILD.rst
index d326ee2..beac5d4 100644
--- a/Help/prop_tgt/UNITY_BUILD.rst
+++ b/Help/prop_tgt/UNITY_BUILD.rst
@@ -31,7 +31,7 @@ ODR (One definition rule) errors
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Since multiple source files are included into one source file,
-it can lead to ODR errors. This section contains properites
+it can lead to ODR errors. This section contains properties
which help fixing these errors.
The source files marked by :prop_sf:`GENERATED` will be skipped
diff --git a/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst b/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst
index 2426689..84047f2 100644
--- a/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst
+++ b/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst
@@ -8,6 +8,6 @@ If the property is not set, CMake will use the value provided
by :variable:`CMAKE_UNITY_BUILD_BATCH_SIZE`.
By setting it to value `0` the generated unity source file will
-contain all the source files that would be otherwise be split
+contain all the source files that would otherwise be split
into multiple batches. It is not recommended to do so, since it
would affect performance.
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index ece3307..b608fcb 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -257,14 +257,14 @@ void QCMake::setProperties(const QCMakePropertyList& newProps)
}
}
- // remove some properites
+ // remove some properties
foreach (QString const& s, toremove) {
this->CMakeInstance->UnwatchUnusedCli(s.toLocal8Bit().data());
state->RemoveCacheEntry(s.toLocal8Bit().data());
}
- // add some new properites
+ // add some new properties
foreach (QCMakeProperty const& s, props) {
this->CMakeInstance->WatchUnusedCli(s.Key.toLocal8Bit().data());
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=048860e172cb08445fca19ea2e4387e5ea3cedbe
commit 048860e172cb08445fca19ea2e4387e5ea3cedbe
Author: nick black <dankamongmen at gmail.com>
AuthorDate: Sat Sep 21 05:23:52 2019 -0400
Commit: nick black <dankamongmen at gmail.com>
CommitDate: Fri Sep 27 21:29:09 2019 -0400
FindCurses: toplevel ncursesw support, recover cflags
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index b3cd8fa..5abc08a 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -18,6 +18,8 @@ This module defines the following variables:
The include directories needed to use Curses.
``CURSES_LIBRARIES``
The libraries needed to use Curses.
+``CURSES_CFLAGS``
+ Parameters which ought be given to C/C++ compilers when using Curses.
``CURSES_HAVE_CURSES_H``
True if curses.h is available.
``CURSES_HAVE_NCURSES_H``
@@ -56,7 +58,7 @@ else()
set(CURSES_NEED_NCURSES TRUE)
endif()
-find_library(CURSES_CURSES_LIBRARY NAMES curses )
+find_library(CURSES_CURSES_LIBRARY NAMES curses)
find_library(CURSES_NCURSES_LIBRARY NAMES "${NCURSES_LIBRARY_NAME}" )
set(CURSES_USE_NCURSES FALSE)
@@ -118,7 +120,7 @@ if(CURSES_USE_NCURSES)
if(CURSES_NCURSES_INCLUDE_PATH)
if (CURSES_NEED_WIDE)
find_path(CURSES_INCLUDE_PATH
- NAMES ncursesw/ncurses.h ncursesw/curses.h
+ NAMES ncursesw/ncurses.h ncursesw/curses.h ncursesw.h cursesw.h
PATHS ${CURSES_NCURSES_INCLUDE_PATH}
NO_DEFAULT_PATH
)
@@ -133,7 +135,7 @@ if(CURSES_USE_NCURSES)
if (CURSES_NEED_WIDE)
find_path(CURSES_INCLUDE_PATH
- NAMES ncursesw/ncurses.h ncursesw/curses.h
+ NAMES ncursesw/ncurses.h ncursesw/curses.h ncursesw.h cursesw.h
HINTS "${_cursesParentDir}/include"
)
else()
@@ -238,10 +240,16 @@ if(CURSES_FORM_LIBRARY)
set(CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_FORM_LIBRARY})
endif()
-# Provide the *_INCLUDE_DIRS result.
+# Provide the *_INCLUDE_DIRS and *_CFLAGS results.
set(CURSES_INCLUDE_DIRS ${CURSES_INCLUDE_PATH})
set(CURSES_INCLUDE_DIR ${CURSES_INCLUDE_PATH}) # compatibility
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(NCURSES QUIET ${NCURSES_LIBRARY_NAME})
+ set(CURSES_CFLAGS ${NCURSES_CFLAGS_OTHER})
+endif()
+
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Curses DEFAULT_MSG
CURSES_LIBRARY CURSES_INCLUDE_PATH)
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/PRECOMPILE_HEADERS_REUSE_FROM.rst | 2 +-
Help/prop_tgt/UNITY_BUILD.rst | 2 +-
Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst | 2 +-
Modules/FindCurses.cmake | 16 ++++++++++++----
Source/QtDialog/QCMake.cxx | 4 ++--
5 files changed, 17 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list