[Cmake-commits] CMake branch, master, updated. v3.14.4-998-g94b2c75
Kitware Robot
kwrobot at kitware.com
Fri May 17 09:43:05 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 94b2c757725b86a38b7934f9e1084debe6dbe2de (commit)
via e1c95bc2788c0c71418a303306a66ff5bad7c938 (commit)
via 21f5ed80918507dc3a9dcd0b617ded901d6db74e (commit)
via 89ab54c11239f4832668ecca6a0b0b9edf112bd8 (commit)
via eda3963615e64f180e452b6e4bd1cce7f9fb14a9 (commit)
via 8c47be28cc2e5d45c53a089b681257c0b8387964 (commit)
via ac86c02d1b6da921c93d53fed85ad70ab05c4608 (commit)
via 2532e00339d34e36e90f78a28c3e4ce882f6fac0 (commit)
via 4edc0ef359578ddaa7db0163e3a6097e12530c9b (commit)
via 93ee7dd044dcebe99531169a0cfd96b3b0c5a2ef (commit)
via 4b4fd99f41e4178d914c41883ee12b63e9cb145a (commit)
from acc2f022bb538cbd61621f66d64d13b751d23f39 (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=94b2c757725b86a38b7934f9e1084debe6dbe2de
commit 94b2c757725b86a38b7934f9e1084debe6dbe2de
Merge: e1c95bc 89ab54c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 17 13:38:50 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri May 17 09:39:48 2019 -0400
Merge topic 'findblas_mklroot_bla_vendor'
89ab54c112 FindBLAS: Choose MKL arch based on BLA_VENDOR
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3330
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1c95bc2788c0c71418a303306a66ff5bad7c938
commit e1c95bc2788c0c71418a303306a66ff5bad7c938
Merge: 21f5ed8 93ee7dd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 17 13:37:35 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri May 17 09:38:44 2019 -0400
Merge topic 'autogen_ninja_clean'
93ee7dd044 Autogen: Update documentation for ADDITIONAL_CLEAN_FILES
4b4fd99f41 Autogen: Use ADDITIONAL_CLEAN_FILES target property for file cleaning
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3327
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21f5ed80918507dc3a9dcd0b617ded901d6db74e
commit 21f5ed80918507dc3a9dcd0b617ded901d6db74e
Merge: acc2f02 eda3963
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 17 13:37:22 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri May 17 09:37:33 2019 -0400
Merge topic 'use_additional_clean_files'
eda3963615 UseSWIG: Use ADDITIONAL_CLEAN_FILES for cleaning
8c47be28cc UseJava: Use ADDITIONAL_CLEAN_FILES for cleaning
ac86c02d1b UseEcos: Use ADDITIONAL_CLEAN_FILES for cleaning
2532e00339 FindDoxygen: Use ADDITIONAL_CLEAN_FILES for cleaning
4edc0ef359 Test: Improve WarnUnusedCliUnused to run on all generators
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3328
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89ab54c11239f4832668ecca6a0b0b9edf112bd8
commit 89ab54c11239f4832668ecca6a0b0b9edf112bd8
Author: Jakub Benda <jacob.benda at gmail.com>
AuthorDate: Thu May 16 09:00:21 2019 +0100
Commit: Jakub Benda <jacob.benda at gmail.com>
CommitDate: Thu May 16 10:35:37 2019 +0100
FindBLAS: Choose MKL arch based on BLA_VENDOR
Recently, FindBLAS has been extended with additional library search
path based on the environment variable MKLROOT. However, the choice
of the Intel MKL architecture (IA-32 vs Intel64) was based on
unrelated (and possibly undefined) size of integer.
This commit changes the selection of the Intel MKL architecture to
instead consider the variable BLA_VENDOR, if available.
So, if the environment variable MKLROOT is defined and
BLA_VENDOR=Intel10_32, then $ENV{MKLROOT}/lib/ia32_<OS> will be added
to the search path (OS = lin, win, or mac).
Similarly, if MKLROOT is defined and BLA_VENDOR=Intel10_64lp or
BLA_VENDOR=Intel10_64ilp, then the path $ENV{MKLROOT}/intel64_<OS>
will be used.
If either MKLROOT or BLA_VENDOR is undefined, no additional search
path on top of LD_LIBRARY_PATH / DYLD_LIBRARY_PATH / LIB is be added.
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
index 8d55ac7..65e5d1c 100644
--- a/Modules/FindBLAS.cmake
+++ b/Modules/FindBLAS.cmake
@@ -403,20 +403,19 @@ if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
endif ()
if (DEFINED ENV{MKLROOT})
- set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}")
+ if (BLA_VENDOR STREQUAL "Intel10_32")
+ set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/ia32")
+ elseif (BLA_VENDOR MATCHES "^Intel10_64i?lp$" OR BLA_VENDOR MATCHES "^Intel10_64i?lp_seq$")
+ set(_BLAS_MKLROOT_LIB_DIR "$ENV{MKLROOT}/lib/intel64")
+ endif ()
endif ()
if (_BLAS_MKLROOT_LIB_DIR)
- if( SIZEOF_INTEGER EQUAL 8 )
- set( _BLAS_MKL_PATH_PREFIX "intel64" )
- else()
- set( _BLAS_MKL_PATH_PREFIX "ia32" )
- endif()
if (WIN32)
- string(APPEND _BLAS_MKLROOT_LIB_DIR "/lib/${_BLAS_MKL_PATH_PREFIX}_win")
+ string(APPEND _BLAS_MKLROOT_LIB_DIR "_win")
elseif (APPLE)
- string(APPEND _BLAS_MKLROOT_LIB_DIR "/lib/${_BLAS_MKL_PATH_PREFIX}_mac")
+ string(APPEND _BLAS_MKLROOT_LIB_DIR "_mac")
else ()
- string(APPEND _BLAS_MKLROOT_LIB_DIR "/lib/${_BLAS_MKL_PATH_PREFIX}_lin")
+ string(APPEND _BLAS_MKLROOT_LIB_DIR "_lin")
endif ()
endif ()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda3963615e64f180e452b6e4bd1cce7f9fb14a9
commit eda3963615e64f180e452b6e4bd1cce7f9fb14a9
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed May 15 12:59:54 2019 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed May 15 15:31:05 2019 +0200
UseSWIG: Use ADDITIONAL_CLEAN_FILES for cleaning
Replace use of the deprecated `ADDITIONAL_MAKE_CLEAN_FILES` directory property
with the new `ADDITIONAL_CLEAN_FILES` directory property.
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index c136b05..78522da 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -708,9 +708,9 @@ function(SWIG_ADD_LIBRARY name)
endif()
endforeach()
set_property (DIRECTORY APPEND PROPERTY
- ADDITIONAL_MAKE_CLEAN_FILES ${swig_generated_sources} ${swig_generated_timestamps})
+ ADDITIONAL_CLEAN_FILES ${swig_generated_sources} ${swig_generated_timestamps})
if (UseSWIG_MODULE_VERSION VERSION_GREATER 1)
- set_property (DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${outputdir}")
+ set_property (DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES "${outputdir}")
endif()
add_library(${target_name}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c47be28cc2e5d45c53a089b681257c0b8387964
commit 8c47be28cc2e5d45c53a089b681257c0b8387964
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed May 15 12:59:23 2019 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed May 15 15:31:05 2019 +0200
UseJava: Use ADDITIONAL_CLEAN_FILES for cleaning
Replace use of the deprecated `ADDITIONAL_MAKE_CLEAN_FILES` directory property
with the new `ADDITIONAL_CLEAN_FILES` directory property.
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index b0315b2..0798488 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -735,7 +735,8 @@ function(add_jar _TARGET_NAME)
# this INTERFACE library depends on jar generation
add_dependencies (${_GENERATE_NATIVE_HEADERS_TARGET} ${_TARGET_NAME})
- set_property (DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_GENERATE_NATIVE_HEADERS_OUTPUT_DIR}")
+ set_property (DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES
+ "${_GENERATE_NATIVE_HEADERS_OUTPUT_DIR}")
endif()
endfunction()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac86c02d1b6da921c93d53fed85ad70ab05c4608
commit ac86c02d1b6da921c93d53fed85ad70ab05c4608
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed May 15 12:58:43 2019 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed May 15 15:31:01 2019 +0200
UseEcos: Use ADDITIONAL_CLEAN_FILES for cleaning
Replace use of the deprecated `ADDITIONAL_MAKE_CLEAN_FILES` directory property
with the new `ADDITIONAL_CLEAN_FILES` directory property.
diff --git a/Modules/UseEcos.cmake b/Modules/UseEcos.cmake
index 1e82f16..60324b1 100644
--- a/Modules/UseEcos.cmake
+++ b/Modules/UseEcos.cmake
@@ -214,10 +214,10 @@ macro(ECOS_ADD_EXECUTABLE _exe_NAME )
)
#add the created files to the clean-files
- set_directory_properties(
- PROPERTIES
- ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.bin;${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.srec;${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst;"
- )
+ set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.bin"
+ "${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.srec"
+ "${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst")
add_custom_target(ecosclean ${CMAKE_COMMAND} -DECOS_DIR=${CMAKE_CURRENT_BINARY_DIR}/ecos/ -P ${ECOS_CMAKE_MODULE_DIR}/ecos_clean.cmake )
add_custom_target(normalclean ${CMAKE_MAKE_PROGRAM} clean WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2532e00339d34e36e90f78a28c3e4ce882f6fac0
commit 2532e00339d34e36e90f78a28c3e4ce882f6fac0
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed May 15 12:55:48 2019 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed May 15 15:28:37 2019 +0200
FindDoxygen: Use ADDITIONAL_CLEAN_FILES for cleaning
Replace use of the deprecated `ADDITIONAL_MAKE_CLEAN_FILES` directory property
with the new `ADDITIONAL_CLEAN_FILES` directory property.
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 32b4aa2..ebd0b24 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -974,7 +974,7 @@ doxygen_add_docs() for target ${targetName}")
"${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_HTML_OUTPUT}")
endif()
set_property(DIRECTORY APPEND PROPERTY
- ADDITIONAL_MAKE_CLEAN_FILES "${_args_clean_html_dir}")
+ ADDITIONAL_CLEAN_FILES "${_args_clean_html_dir}")
endif()
# Build up a list of files we can identify from the inputs so we can list
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4edc0ef359578ddaa7db0163e3a6097e12530c9b
commit 4edc0ef359578ddaa7db0163e3a6097e12530c9b
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed May 15 12:36:27 2019 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed May 15 15:28:37 2019 +0200
Test: Improve WarnUnusedCliUnused to run on all generators
In the WarnUnusedCliUnused test, the whole CMakeCache.txt was removed in the
clean stage to trigger the same CMake warning in re-builds. This technique
worked only in the Makefile generators and the test was limited to these.
Now only the variable of interest is removed from the cache by using a
`unset(UNUSED_CLI_VARIABLE CACHE)` statement in the CMakeLists.txt file.
This makes the WarnUnusedCliUnused test run on all generators
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d992986..852b00f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2525,24 +2525,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
FAIL_REGULAR_EXPRESSION "CMakeLists.txt:5 \\(set\\):")
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedUnusedViaUnset")
- if("${CMAKE_GENERATOR}" MATCHES "Makefile" AND NOT WIN32)
- # Ninja does not support ADDITIONAL_MAKE_CLEAN_FILES and therefore fails
- # this test. (See #13371)
- # Apparently Visual Studio does not support it either. As the MakeClean
- # test above is only run with the Makefiles generator, only run this
- # test with the Makefiles generator also.
- add_test(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Tests/WarnUnusedCliUnused"
- "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused"
- ${build_generator_args}
- --build-project WarnUnusedCliUnused
- --build-options ${build_options}
- "-DUNUSED_CLI_VARIABLE=Unused")
- set_tests_properties(WarnUnusedCliUnused PROPERTIES
- PASS_REGULAR_EXPRESSION "CMake Warning:.*Manually-specified variables were not used by the project:.* UNUSED_CLI_VARIABLE")
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused")
- endif()
+ add_test(WarnUnusedCliUnused ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/WarnUnusedCliUnused"
+ "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused"
+ ${build_generator_args}
+ --build-project WarnUnusedCliUnused
+ --build-options ${build_options}
+ "-DUNUSED_CLI_VARIABLE=Unused")
+ set_tests_properties(WarnUnusedCliUnused PROPERTIES
+ PASS_REGULAR_EXPRESSION "CMake Warning:.*Manually-specified variables were not used by the project:.* UNUSED_CLI_VARIABLE")
+ list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedCliUnused")
add_test(WarnUnusedCliUsed ${CMAKE_CTEST_COMMAND}
--build-and-test
diff --git a/Tests/WarnUnusedCliUnused/CMakeLists.txt b/Tests/WarnUnusedCliUnused/CMakeLists.txt
index 7ed69bf..a149f04 100644
--- a/Tests/WarnUnusedCliUnused/CMakeLists.txt
+++ b/Tests/WarnUnusedCliUnused/CMakeLists.txt
@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.14)
project(WarnUnusedCliUnused)
-set_directory_properties(PROPERTIES
- ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_BINARY_DIR}/CMakeCache.txt"
-)
+# Remove UNUSED_CLI_VARIABLE from the cache to trigger the
+# CMake warning message on re-builds as well.
+unset(UNUSED_CLI_VARIABLE CACHE)
add_library(dummy empty.cpp)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93ee7dd044dcebe99531169a0cfd96b3b0c5a2ef
commit 93ee7dd044dcebe99531169a0cfd96b3b0c5a2ef
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed May 15 11:12:04 2019 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed May 15 15:28:17 2019 +0200
Autogen: Update documentation for ADDITIONAL_CLEAN_FILES
Update the AUTOGEN documentation for the use of `ADDITIONAL_CLEAN_FILES`
instead of `ADDITIONAL_MAKE_CLEAN_FILES`.
diff --git a/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst b/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
index 8db6ede..909b14c 100644
--- a/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
+++ b/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
@@ -5,7 +5,7 @@ Directory where :prop_tgt:`AUTOMOC`, :prop_tgt:`AUTOUIC` and :prop_tgt:`AUTORCC`
generate files for the target.
The directory is created on demand and automatically added to the
-:prop_dir:`ADDITIONAL_MAKE_CLEAN_FILES`.
+:prop_tgt:`ADDITIONAL_CLEAN_FILES` target property.
When unset or empty the directory ``<dir>/<target-name>_autogen`` is used where
``<dir>`` is :variable:`CMAKE_CURRENT_BINARY_DIR` and ``<target-name>``
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b4fd99f41e4178d914c41883ee12b63e9cb145a
commit 4b4fd99f41e4178d914c41883ee12b63e9cb145a
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Wed May 15 10:52:49 2019 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed May 15 15:28:17 2019 +0200
Autogen: Use ADDITIONAL_CLEAN_FILES target property for file cleaning
The `ADDITIONAL_CLEAN_FILES` target property works on multiple generators
to remove addition files at the clean target. In `AUTOGEN` use it instead of
the deprecated and limited `ADDITIONAL_MAKE_CLEAN_FILES` directory property
to remove `AUTOGEN` generated files.
Fixes: #17074 "Autogen: clean target with ninja generator doesn’t clean
autogen files"
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index 38f39fb..a5e0f32 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -52,12 +52,6 @@ static std::size_t GetParallelCPUCount()
return count;
}
-static void AddCleanFile(cmMakefile* makefile, std::string const& fileName)
-{
- makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES", fileName.c_str(),
- false);
-}
-
static std::string FileProjectRelativePath(cmMakefile* makefile,
std::string const& fileName)
{
@@ -320,7 +314,7 @@ bool cmQtAutoGenInitializer::InitCustomTargets()
}
cmSystemTools::ConvertToUnixSlashes(this->Dir.Build);
// Cleanup build directory
- AddCleanFile(makefile, this->Dir.Build);
+ this->AddCleanFile(this->Dir.Build);
// Working directory
this->Dir.Work = cbd;
@@ -381,15 +375,15 @@ bool cmQtAutoGenInitializer::InitCustomTargets()
std::string& filename = this->AutogenTarget.ConfigSettingsFile[cfg];
filename =
AppendFilenameSuffix(this->AutogenTarget.SettingsFile, "_" + cfg);
- AddCleanFile(makefile, filename);
+ this->AddCleanFile(filename);
}
} else {
- AddCleanFile(makefile, this->AutogenTarget.SettingsFile);
+ this->AddCleanFile(this->AutogenTarget.SettingsFile);
}
this->AutogenTarget.ParseCacheFile = this->Dir.Info;
this->AutogenTarget.ParseCacheFile += "/ParseCache.txt";
- AddCleanFile(makefile, this->AutogenTarget.ParseCacheFile);
+ this->AddCleanFile(this->AutogenTarget.ParseCacheFile);
}
// Autogen target: Compute user defined dependencies
@@ -1528,6 +1522,12 @@ bool cmQtAutoGenInitializer::AddToSourceGroup(std::string const& fileName,
return true;
}
+void cmQtAutoGenInitializer::AddCleanFile(std::string const& fileName)
+{
+ Target->Target->AppendProperty("ADDITIONAL_CLEAN_FILES", fileName.c_str(),
+ false);
+}
+
static unsigned int CharPtrToUInt(const char* const input)
{
unsigned long tmp = 0;
diff --git a/Source/cmQtAutoGenInitializer.h b/Source/cmQtAutoGenInitializer.h
index 153f56d..6d2dcb6 100644
--- a/Source/cmQtAutoGenInitializer.h
+++ b/Source/cmQtAutoGenInitializer.h
@@ -145,6 +145,7 @@ private:
bool prepend = false);
bool AddToSourceGroup(std::string const& fileName,
std::string const& genNameUpper);
+ void AddCleanFile(std::string const& fileName);
bool GetQtExecutable(GenVarsT& genVars, const std::string& executable,
bool ignoreMissingTarget, std::string* output) const;
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/AUTOGEN_BUILD_DIR.rst | 2 +-
Modules/FindBLAS.cmake | 17 ++++++++---------
Modules/FindDoxygen.cmake | 2 +-
Modules/UseEcos.cmake | 8 ++++----
Modules/UseJava.cmake | 3 ++-
Modules/UseSWIG.cmake | 4 ++--
Source/cmQtAutoGenInitializer.cxx | 20 ++++++++++----------
Source/cmQtAutoGenInitializer.h | 1 +
Tests/CMakeLists.txt | 29 +++++++++++------------------
Tests/WarnUnusedCliUnused/CMakeLists.txt | 8 ++++----
10 files changed, 44 insertions(+), 50 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list