[cmake-developers] [ANNOUNCE] CMake 3.4.0-rc1 is now ready!
I am proud to announce the first CMake 3.4 release candidate. Sources and binaries are available at: https://cmake.org/download/ Documentation is available at: https://cmake.org/cmake/help/v3.4 Release notes appear below and are also published at https://cmake.org/cmake/help/v3.4/release/3.4.html Some of the more significant features of CMake 3.4 are: * The "if()" command learned a new "TEST" operator that evaluates to true if a given test name has been defined by the "add_test()" command. See policy "CMP0064". * The "install(DIRECTORY)" command "DESTINATION" option learned to support "generator expressions". * The "install(FILES)" command "DESTINATION" option learned to support "generator expressions". * CMake learned to honor "*.manifest" source files with MSVC tools. Manifest files named as sources of ".exe" and ".dll" targets will be merged with linker-generated manifests and embedded in the binary. Deprecated and Removed Features: * The "CMakeExpandImportedTargets" module is now documented as deprecated. See module documentation for an explanation. * The "CMAKE_USE_RELATIVE_PATHS" variable no longer has any effect. Previously it was partially implemented and unreliable. CMake 3.4 Release Notes *** Changes made since CMake 3.3 include the following. New Features Generators -- * The "Visual Studio 14 2015" generator learned to select a Windows 10 SDK based on the value of the "CMAKE_SYSTEM_VERSION" variable and the SDKs available on the host. * CMake learned rudimentary support for the Apple Swift language. When using the "Xcode" generator with Xcode 6.1 or higher, one may enable the "Swift" language with the "enable_language()" command or the "project()" command (this is an error with other generators or when Xcode is too old). Then one may list ".swift" source files in targets for compilation. Commands * The "find_program()" command learned a "NAMES_PER_DIR" option to consider all given "NAMES" in each directory before moving on to the next directory. * The "get_filename_component()" command learned a new "BASE_DIR" subcommand. This is used to specify a base directory when calculating an absolute path from a relative path. * The "if()" command learned a new "TEST" operator that evaluates to true if a given test name has been defined by the "add_test()" command. See policy "CMP0064". * The "install(DIRECTORY)" command "DESTINATION" option learned to support "generator expressions". * The "install(FILES)" command "DESTINATION" option learned to support "generator expressions". * The "string()" command learned a new "APPEND" subcommand. Variables - * The Makefile Generators and the "Ninja" generator learned to add compiler launcher tools like distcc and ccache along with the compiler for "C" and "CXX" languages. See the "CMAKE__COMPILER_LAUNCHER" variable and "_COMPILER_LAUNCHER" target property for details. * New "CMAKE_LINK_SEARCH_START_STATIC" and "CMAKE_LINK_SEARCH_END_STATIC" variables were introduced to initialize the "LINK_SEARCH_START_STATIC" and "LINK_SEARCH_END_STATIC" target properties, respectively. Properties -- * Visual Studio Generators learned to support additonal target properties to customize projects for NVIDIA Nsight Tegra Visual Studio Edition: * "ANDROID_ANT_ADDITIONAL_OPTIONS" * "ANDROID_ARCH" * "ANDROID_ASSETS_DIRECTORIES" * "ANDROID_JAR_DEPENDENCIES" * "ANDROID_JAR_DIRECTORIES" * "ANDROID_JAVA_SOURCE_DIR" * "ANDROID_NATIVE_LIB_DEPENDENCIES" * "ANDROID_NATIVE_LIB_DIRECTORIES" * "ANDROID_PROCESS_MAX" * "ANDROID_PROGUARD" * "ANDROID_PROGUARD_CONFIG_PATH" * "ANDROID_SECURE_PROPS_PATH" * "ANDROID_SKIP_ANT_STEP" * "ANDROID_STL_TYPE" * The "ARCHIVE_OUTPUT_DIRECTORY", "LIBRARY_OUTPUT_DIRECTORY", and "RUNTIME_OUTPUT_DIRECTORY" target properties learned to support "generator expressions". * The "SOURCE_DIR" and "BINARY_DIR" target properties were introduced to allow project code to query where a target is defined. * The "OUTPUT_NAME" target property and its variants learned to support "generator expressions". * A "TARGET_MESSAGES" global property was added to tell the Makefile Generators whether to generate commands to print output after each target is completed. * On Windows with MS-compatible tools, CMake learned to optionally generate a module definition (".def") file for "SHARED" libraries. See the "WINDOWS_EXPORT_ALL_SYMBOLS" target property. Modules --- * The "ExternalProject" module "ExternalProject_Add()" function "GIT_SUBMODULES" option now also limits the set of submodules that are initialized in addition to the prior behavior of limiting the set of submodules that are updated. * The "ExternalProject" module learned new "USES_TERMINAL" arguments for giving steps exclusive terminal access. This is useful with the "Ninja"
[Cmake-commits] CMake branch, next, updated. v3.3.2-1485-gf0dba83
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 f0dba830863feecb9b147632ae5b49c209249dc1 (commit) via d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 (commit) via bca73252130b7f60fc12b7bcbbc95a3153047bd3 (commit) from fc4520b4b8a2656ba636fc58a4923e1b9c475c6e (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=f0dba830863feecb9b147632ae5b49c209249dc1 commit f0dba830863feecb9b147632ae5b49c209249dc1 Merge: fc4520b d0c3bf6 Author: Brad KingAuthorDate: Tue Oct 6 10:47:33 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:47:33 2015 -0400 Merge topic 'update-kwsys' into next d0c3bf65 Merge branch 'upstream-kwsys' into update-kwsys bca73252 KWSys 2015-10-06 (d79801bb) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 commit d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 Merge: f2791da bca7325 Author: Brad King AuthorDate: Tue Oct 6 10:32:55 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 10:32:55 2015 -0400 Merge branch 'upstream-kwsys' into update-kwsys https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bca73252130b7f60fc12b7bcbbc95a3153047bd3 commit bca73252130b7f60fc12b7bcbbc95a3153047bd3 Author: KWSys Robot AuthorDate: Tue Oct 6 10:28:20 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 10:32:51 2015 -0400 KWSys 2015-10-06 (d79801bb) Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d79801bb | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 2089567a..d79801bb Brad King (1): e56e3292 Encoding: Support building on Windows with WIN32_LEAN_AND_MEAN Terrell Russell (1): d79801bb SystemTools: Fix spelling of "succeeded" in comments diff --git a/EncodingCXX.cxx b/EncodingCXX.cxx index 7d9b3e4..597d4bd 100644 --- a/EncodingCXX.cxx +++ b/EncodingCXX.cxx @@ -38,6 +38,7 @@ // Windows API. #if defined(_WIN32) # include +# include #endif namespace KWSYS_NAMESPACE diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in index d2d1d40..bba5a5c 100644 --- a/SystemTools.hxx.in +++ b/SystemTools.hxx.in @@ -703,13 +703,13 @@ public: /** * Create a symbolic link if the platform supports it. Returns whether - * creation succeded. + * creation succeeded. */ static bool CreateSymlink(const std::string& origName, const std::string& newName); /** * Read the contents of a symbolic link. Returns whether reading - * succeded. + * succeeded. */ static bool ReadSymlink(const std::string& newName, std::string& origName); --- Summary of changes: Source/kwsys/EncodingCXX.cxx|1 + Source/kwsys/SystemTools.hxx.in |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [cmake-developers] CXX_STANDARD and linking
On 10/04/2015 10:47 AM, Stephen Kelly wrote: > So, is this thread really about a bug, or is it a feature request? I think it has become a feature request to select link flags for language standard levels. It is conflated with a bug fix because the link flags are needed to support existing features on Solaris. > Perhaps those commits should be reverted. I see no reason for SolarisStudio > on linux to behave any differently than on solaris, so the commit relating > to that is probably not appropriate. I don't want CMake to generate broken builds by default. We *know* it goes wrong on Solaris and cannot possibly work without user intervention. If a problem comes up on Linux too we can deal with it as necessary. > I wrote here some ideas of a design for specifying the standard library to > use: > > > http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/13284/focus=13296 Is that the right link? I don't see discussion of -stdlib= in that message. > Perhaps, rather than passing CMAKE_CXX11_EXTENSION_COMPILE_OPTION to the > linker, we should work more on a design like the above way to specify a > standard library. Yes, but the -std= and -stdlib= flags are different from the full LINK_OPTIONS discussion because they are meant specifically for the front end and not for the linker (never "-Wl,"). Also they need to be selected by CMake rather than propagated as a flag specified by project code. > The compile features can imply a default and a set of allowed alternatives > (for example, compiling with cxx_static_assert implies the use of stdlibc++ > or libc++ with Clang by default but there is a way to use the other > instead). The COMPATIBLE_INTERFACE features may also be used to ensure that > targets which link together all use the same standard library. Originally I was thinking we should just use the same -std= for linking that we do for compilation, but don't we currently support compiling different targets at different standard levels and then linking them? In that case we will certainly need more sophisticated logic for selecting the link flag. BTW, I noticed in cmLocalGenerator::AddCompileOptions that we currently mutate the configure step result by setting target properties like _STANDARD during generation. Also, this is done with one "config" value which may not be appropriate in multi-config generators. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[Cmake-commits] CMake branch, next, updated. v3.3.2-1487-ga868359
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 a868359d4b10a917c30174613c1aeb6bdf5d6fdf (commit) via 15c02cf14edd823b96660e65772a9db568a25bdc (commit) from f0dba830863feecb9b147632ae5b49c209249dc1 (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=a868359d4b10a917c30174613c1aeb6bdf5d6fdf commit a868359d4b10a917c30174613c1aeb6bdf5d6fdf Merge: f0dba83 15c02cf Author: Brad KingAuthorDate: Tue Oct 6 10:57:30 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:57:30 2015 -0400 Merge topic 'refactor-qt-autogen' into next 15c02cf1 QtAutogen: Port API to cmGeneratorTarget. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15c02cf14edd823b96660e65772a9db568a25bdc commit 15c02cf14edd823b96660e65772a9db568a25bdc Author: Stephen Kelly AuthorDate: Mon Oct 5 19:21:30 2015 +0200 Commit: Brad King CommitDate: Tue Oct 6 10:56:44 2015 -0400 QtAutogen: Port API to cmGeneratorTarget. diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 21ada71..309884f 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1267,7 +1267,7 @@ bool cmGlobalGenerator::Compute() for (std::vector::iterator it = autogenTargets.begin(); it != autogenTargets.end(); ++it) { -cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget((*it)->Target); +cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget(*it); } #endif @@ -1451,15 +1451,14 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets() cmGeneratorTarget* gt = this->GetGeneratorTarget(>second); - cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt->Target); + cmQtAutoGeneratorInitializer::InitializeAutogenSources(gt); filteredTargets.push_back(gt); } for(std::vector ::iterator ti = filteredTargets.begin(); ti != filteredTargets.end(); ++ti) { - cmTarget* target = (*ti)->Target; cmQtAutoGeneratorInitializer::InitializeAutogenTarget( - this->LocalGenerators[i], target); + this->LocalGenerators[i], *ti); autogenTargets.push_back(*ti); } } diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index fe888b7..2703f4c 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -25,19 +25,16 @@ # include "cmGlobalVisualStudioGenerator.h" #endif -static void SetupSourceFiles(cmTarget const* target, +static void SetupSourceFiles(cmGeneratorTarget const* target, std::vector& skipMoc, std::vector& mocSources, std::vector& mocHeaders, std::vector& skipUic) { - cmMakefile* makefile = target->GetMakefile(); + cmMakefile* makefile = target->Target->GetMakefile(); std::vector srcFiles; - cmGeneratorTarget *gtgt = target->GetMakefile() - ->GetGlobalGenerator() - ->GetGeneratorTarget(target); - gtgt->GetConfigCommonSourceFiles(srcFiles); + target->GetConfigCommonSourceFiles(srcFiles); std::vector newRccFiles; @@ -67,7 +64,7 @@ static void SetupSourceFiles(cmTarget const* target, std::string basename = cmsys::SystemTools:: GetFilenameWithoutLastExtension(absFile); -std::string rcc_output_dir = target->GetSupportDirectory(); +std::string rcc_output_dir = target->Target->GetSupportDirectory(); cmSystemTools::MakeDirectory(rcc_output_dir.c_str()); std::string rcc_output_file = rcc_output_dir; rcc_output_file += "/qrc_" + basename + ".cpp"; @@ -104,40 +101,38 @@ static void SetupSourceFiles(cmTarget const* target, fileIt != newRccFiles.end(); ++fileIt) { -const_cast (target)->AddSource(*fileIt); +const_cast (target->Target)->AddSource(*fileIt); } } -static void GetCompileDefinitionsAndDirectories(cmTarget const* target, -const std::string& config, -std::string , -std::string ) +static void GetCompileDefinitionsAndDirectories( + cmGeneratorTarget const* target, + const std::string& config, + std::string , + std::string ) { - cmMakefile* makefile =
[Cmake-commits] CMake branch, next, updated. v3.3.2-1482-gfc4520b
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 fc4520b4b8a2656ba636fc58a4923e1b9c475c6e (commit) via 062473842f3c926944cbc2a32c7703bc1204890d (commit) via b6702d40dd9ab512a8cd56dd202ebe8cdbdb03d9 (commit) from a5971e8b348e48ff5bbb489992d41905f6aa5d65 (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=fc4520b4b8a2656ba636fc58a4923e1b9c475c6e commit fc4520b4b8a2656ba636fc58a4923e1b9c475c6e Merge: a5971e8 0624738 Author: Brad KingAuthorDate: Tue Oct 6 10:32:25 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:32:25 2015 -0400 Merge topic 'fix-spelling-typos' into next 06247384 bootstrap: Fix spelling of "succeeded" b6702d40 Modules: Fix spelling of "succeeded" in check messages https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=062473842f3c926944cbc2a32c7703bc1204890d commit 062473842f3c926944cbc2a32c7703bc1204890d Author: Terrell Russell AuthorDate: Mon Oct 5 21:42:19 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 10:27:00 2015 -0400 bootstrap: Fix spelling of "succeeded" diff --git a/bootstrap b/bootstrap index 31e9b89..ca4fd5e 100755 --- a/bootstrap +++ b/bootstrap @@ -572,7 +572,7 @@ cmake_try_run () echo "Test produced non-zero return code" return 3 fi - echo "Test succeded" + echo "Test succeeded" return 0 } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6702d40dd9ab512a8cd56dd202ebe8cdbdb03d9 commit b6702d40dd9ab512a8cd56dd202ebe8cdbdb03d9 Author: Terrell Russell AuthorDate: Mon Oct 5 21:42:19 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 10:26:19 2015 -0400 Modules: Fix spelling of "succeeded" in check messages Change "succeded" to "succeeded" everywhere. diff --git a/Modules/CheckCSourceCompiles.cmake b/Modules/CheckCSourceCompiles.cmake index 6e80fb5..c2b1723 100644 --- a/Modules/CheckCSourceCompiles.cmake +++ b/Modules/CheckCSourceCompiles.cmake @@ -93,7 +93,7 @@ macro(CHECK_C_SOURCE_COMPILES SOURCE VAR) message(STATUS "Performing Test ${VAR} - Success") endif() file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log -"Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n" +"Performing C SOURCE FILE Test ${VAR} succeeded with the following output:\n" "${OUTPUT}\n" "Source file was:\n${SOURCE}\n") else() diff --git a/Modules/CheckCSourceRuns.cmake b/Modules/CheckCSourceRuns.cmake index 0ce423c..5afeab6 100644 --- a/Modules/CheckCSourceRuns.cmake +++ b/Modules/CheckCSourceRuns.cmake @@ -81,7 +81,7 @@ macro(CHECK_C_SOURCE_RUNS SOURCE VAR) message(STATUS "Performing Test ${VAR} - Success") endif() file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log -"Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n" +"Performing C SOURCE FILE Test ${VAR} succeeded with the following output:\n" "${OUTPUT}\n" "Return value: ${${VAR}}\n" "Source file was:\n${SOURCE}\n") diff --git a/Modules/CheckCXXSourceCompiles.cmake b/Modules/CheckCXXSourceCompiles.cmake index 6d52ec6..f8736e2 100644 --- a/Modules/CheckCXXSourceCompiles.cmake +++ b/Modules/CheckCXXSourceCompiles.cmake @@ -94,7 +94,7 @@ macro(CHECK_CXX_SOURCE_COMPILES SOURCE VAR) message(STATUS "Performing Test ${VAR} - Success") endif() file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log -"Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n" +"Performing C++ SOURCE FILE Test ${VAR} succeeded with the following output:\n" "${OUTPUT}\n" "Source file was:\n${SOURCE}\n") else() diff --git a/Modules/CheckCXXSourceRuns.cmake b/Modules/CheckCXXSourceRuns.cmake index 3c06d75..84b661d 100644 --- a/Modules/CheckCXXSourceRuns.cmake +++ b/Modules/CheckCXXSourceRuns.cmake @@ -82,7 +82,7 @@ macro(CHECK_CXX_SOURCE_RUNS SOURCE VAR) message(STATUS "Performing Test ${VAR} - Success") endif() file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log -"Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n" +"Performing C++ SOURCE FILE Test ${VAR} succeeded with the following output:\n" "${OUTPUT}\n" "Return value: ${${VAR}}\n" "Source file was:\n${SOURCE}\n") diff --git
[CMake] [ANNOUNCE] CMake 3.4.0-rc1 is now ready!
I am proud to announce the first CMake 3.4 release candidate. Sources and binaries are available at: https://cmake.org/download/ Documentation is available at: https://cmake.org/cmake/help/v3.4 Release notes appear below and are also published at https://cmake.org/cmake/help/v3.4/release/3.4.html Some of the more significant features of CMake 3.4 are: * The "if()" command learned a new "TEST" operator that evaluates to true if a given test name has been defined by the "add_test()" command. See policy "CMP0064". * The "install(DIRECTORY)" command "DESTINATION" option learned to support "generator expressions". * The "install(FILES)" command "DESTINATION" option learned to support "generator expressions". * CMake learned to honor "*.manifest" source files with MSVC tools. Manifest files named as sources of ".exe" and ".dll" targets will be merged with linker-generated manifests and embedded in the binary. Deprecated and Removed Features: * The "CMakeExpandImportedTargets" module is now documented as deprecated. See module documentation for an explanation. * The "CMAKE_USE_RELATIVE_PATHS" variable no longer has any effect. Previously it was partially implemented and unreliable. CMake 3.4 Release Notes *** Changes made since CMake 3.3 include the following. New Features Generators -- * The "Visual Studio 14 2015" generator learned to select a Windows 10 SDK based on the value of the "CMAKE_SYSTEM_VERSION" variable and the SDKs available on the host. * CMake learned rudimentary support for the Apple Swift language. When using the "Xcode" generator with Xcode 6.1 or higher, one may enable the "Swift" language with the "enable_language()" command or the "project()" command (this is an error with other generators or when Xcode is too old). Then one may list ".swift" source files in targets for compilation. Commands * The "find_program()" command learned a "NAMES_PER_DIR" option to consider all given "NAMES" in each directory before moving on to the next directory. * The "get_filename_component()" command learned a new "BASE_DIR" subcommand. This is used to specify a base directory when calculating an absolute path from a relative path. * The "if()" command learned a new "TEST" operator that evaluates to true if a given test name has been defined by the "add_test()" command. See policy "CMP0064". * The "install(DIRECTORY)" command "DESTINATION" option learned to support "generator expressions". * The "install(FILES)" command "DESTINATION" option learned to support "generator expressions". * The "string()" command learned a new "APPEND" subcommand. Variables - * The Makefile Generators and the "Ninja" generator learned to add compiler launcher tools like distcc and ccache along with the compiler for "C" and "CXX" languages. See the "CMAKE__COMPILER_LAUNCHER" variable and "_COMPILER_LAUNCHER" target property for details. * New "CMAKE_LINK_SEARCH_START_STATIC" and "CMAKE_LINK_SEARCH_END_STATIC" variables were introduced to initialize the "LINK_SEARCH_START_STATIC" and "LINK_SEARCH_END_STATIC" target properties, respectively. Properties -- * Visual Studio Generators learned to support additonal target properties to customize projects for NVIDIA Nsight Tegra Visual Studio Edition: * "ANDROID_ANT_ADDITIONAL_OPTIONS" * "ANDROID_ARCH" * "ANDROID_ASSETS_DIRECTORIES" * "ANDROID_JAR_DEPENDENCIES" * "ANDROID_JAR_DIRECTORIES" * "ANDROID_JAVA_SOURCE_DIR" * "ANDROID_NATIVE_LIB_DEPENDENCIES" * "ANDROID_NATIVE_LIB_DIRECTORIES" * "ANDROID_PROCESS_MAX" * "ANDROID_PROGUARD" * "ANDROID_PROGUARD_CONFIG_PATH" * "ANDROID_SECURE_PROPS_PATH" * "ANDROID_SKIP_ANT_STEP" * "ANDROID_STL_TYPE" * The "ARCHIVE_OUTPUT_DIRECTORY", "LIBRARY_OUTPUT_DIRECTORY", and "RUNTIME_OUTPUT_DIRECTORY" target properties learned to support "generator expressions". * The "SOURCE_DIR" and "BINARY_DIR" target properties were introduced to allow project code to query where a target is defined. * The "OUTPUT_NAME" target property and its variants learned to support "generator expressions". * A "TARGET_MESSAGES" global property was added to tell the Makefile Generators whether to generate commands to print output after each target is completed. * On Windows with MS-compatible tools, CMake learned to optionally generate a module definition (".def") file for "SHARED" libraries. See the "WINDOWS_EXPORT_ALL_SYMBOLS" target property. Modules --- * The "ExternalProject" module "ExternalProject_Add()" function "GIT_SUBMODULES" option now also limits the set of submodules that are initialized in addition to the prior behavior of limiting the set of submodules that are updated. * The "ExternalProject" module learned new "USES_TERMINAL" arguments for giving steps exclusive terminal access. This is useful with the "Ninja"
[Cmake-commits] CMake annotated tag, v3.4.0-rc1, created. v3.4.0-rc1
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 annotated tag, v3.4.0-rc1 has been created at 2b9bd8ea2dff25c70bb2067383c977e3db40dc67 (tag) tagging 679a5d2185b15dcd0ff73f7c1c2d7d527c53de53 (commit) replaces v3.3.2 tagged by Brad King on Tue Oct 6 10:45:01 2015 -0400 - Log - CMake 3.4.0-rc1 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWE95tAAoJEC0s7xA0khaEQGQP/R6aq8wnFaijocRVsagJQsnz aFmZwioY/Q4q/q+Sk8qrNjnpf+agbjgVqprMkxiUyoYIu27pTTJ6JjP1qX56kPX8 f3QRx6evUnKbM7r2gw3a87qFfy6olKHd1sJH1MR/YOKzfbP0G4GeVacoFEODDuJE GVN5e6OukFEJ+/6NGOsySPLZ1pxkNGFDPVUJSdEf4rtQfGvFyD+yaJVGwPXQ9F3H m2DT4HLwzidITYLzxt6vl929wvOsMXE6t2GFHqIY1xTilyUQ6+oFNzFNbIGBngml WZIr6as/cqSOW2DeW56HIVmr9Teih0GbH15fSAxgYMDU7BEmwuAtBTs1tNQRc/vU ZKNiaJQCnlVqJoSdmecmabAT02Dc5UZ6/bagjVC/TVl1xJasLhwXW/5CfQ+u+CYD 6B0D05lRWOBaCjMIWBE0oXkzNTi/CkTDFjOVNRQOIGpj0R+JhEqFXzibo2BbH/8B z4aT/IJsNrm7CLLT+vZcOXSzEc5Et49JZQg55t7COeFZ8v0c+OzlI+9VF4DHAG0R S/phccmoO1rG9AzREaya1Nmz+yTWv1G/NmyMGJM5hK6ZaQe5lxYgFOG2G9imLHHu +B/KSd07GDHhhCmBkXFo17vUTJCf1wftdFw9bmdpqosqKhXoCMJJ/z1UdhdvfP73 9loelpmtI4qF+65RCMuA =1wLg -END PGP SIGNATURE- A. Joël Lamotte (2): FindProtobuf: Search x64 directories in VS-built protobuf source (#14833) ExternalProject: Tell "hg clone" not to implicitly update Alex Turbov (1): GNUInstallDirs: Add special cases for certain prefixes Andreas Bergmeier (1): FindProtobuf: Add protobuf_generate_python function Bastien Schatt (1): cmLocalVisualStudioGenerator: Use computed .obj extension (#13685) Ben Boeckel (7): cmake: add --trace-expand option FindPkgConfig: use execute_process to strip trailing whitespace CTestCoverageCollectGCOV: replace tabulators CTEST_CUSTOM_*: treat variables as lists ctest_read_custom_files: mention that ctest does this automatically FindPkgConfig: add a command to query arbitrary variables Help: document CTEST_CUSTOM_* variables Ben Webb (1): FindSWIG: Do not generate erroneous outputs with -noproxy Betsy McPhail (2): ctest: Optionally avoid starting tests that may exceed a given CPU load CTest: Show the number of tests for each label in the summary Bill Hoffman (12): Add options to launch the compiler through tools like ccache or distcc FindCUDA: Resolve a host compiler symlink only if it is Apple cc -> clang bindexplib: Import original implementation from CERN bindexplib: Add copyright/license notice block bindexplib: Drop code that CMake does not need bindexplib: Wrap long lines bindexplib: Build source as part of CMakeLib bindexplib: Teach DumpFile to return errors bindexplib: Fix treatment of some symbols bindexplib: Add support for "/bigobj" format objects Windows: Optionally generate DLL module definition files automatically Windows: Fix 64-bit DLL module definition file generation on VS 2015 Bill Somerville (2): GetPrerequisites: Add error checks for execute_process() calls GetPrerequisites: Optionally filter "objdump" output for speed Brad King (590): Merge branch 'release' Begin post-3.3 development CTest: Capture test stdout/stderr through one pipe (#15600) VS: Compute project GUIDs deterministically Merge topic 'CPackDeb-dpkg-shlibdeps-check-flag' Merge topic 'vs-deterministic-guid' Merge topic 'ctest-merge-test-output' Merge topic 'minor-cleanups' Merge topic 'rename-cmState-API' Merge topic 'remove-CMAKE_USE_RELATIVE_PATHS' Merge topic 'cmMakefile-Configure' Merge branch 'upstream-kwsys' into update-kwsys Merge branch 'release' Merge topic 'update-kwsys' Help: Add notes for topic 'ExternalProject_init_selected_submodules' Merge topic 'ExternalProject_init_selected_submodules' Merge topic 'doc-add_custom_command-clarify-TARGET_FILE' Merge topic 'vs-deterministic-guid' Merge topic 'extract-cmLinkedTree' Merge topic 'extract-cmOutputConverter' Merge topic 'move-Feature-API' Merge topic 'minor-cleanups' Merge topic 'clean-up-cmMakefile' Merge topic 'data-layout' Help: Document CMAKE_SYSTEM_FRAMEWORK_PATH variable Help: Document CMAKE_SYSTEM_APPBUNDLE_PATH variable Help: Document CMAKE_FIND_APPBUNDLE and CMAKE_FIND_FRAMEWORK Help: Improve documentation formatting of find_* commands Help: Document find_* command versioned/unversioned name ordering Utilities/Release: Update to more recent Qt 4.8 on OS X Merge topic 'FindwxWidgets-versioned-executable' Merge topic 'cmake-gui-osx-install-command-line' Merge topic 'revert-mingw-no-find_library-dll' Merge topic 'ctest-script-mode-no-legacy-cygwin'
[Cmake-commits] CMake branch, master, updated. v3.3.2-1451-g256bf88
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 256bf8876a2e460afc37dbe17eb34482944be20b (commit) via d945b36a93ab9f935c4e369d5c75be8b47d48f7a (commit) via 48f8b6acf3a8083b5a52bbe1ec3adc10c515d710 (commit) from 5d315f32236dfebf3561789d17b2d86c504d (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=256bf8876a2e460afc37dbe17eb34482944be20b commit 256bf8876a2e460afc37dbe17eb34482944be20b Merge: 5d315f3 d945b36 Author: Brad KingAuthorDate: Tue Oct 6 10:59:13 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:59:13 2015 -0400 Merge topic 'cmGeneratorTarget-exports' d945b36a cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget. 48f8b6ac cmExportFileGenerator: Evaluate genex with cmGeneratorTarget. --- Summary of changes: Source/cmExportFileGenerator.cxx | 14 -- Source/cmExportTryCompileFileGenerator.cxx |8 ++-- 2 files changed, 14 insertions(+), 8 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, master, updated. v3.3.2-1448-g5d315f3
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 5d315f32236dfebf3561789d17b2d86c504d (commit) via 821e17785ecd4a329842dc6c5b093eb30cc4f160 (commit) from 53d90de3d9b536bcee45acc40183569895a9776e (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=5d315f32236dfebf3561789d17b2d86c504d commit 5d315f32236dfebf3561789d17b2d86c504d Merge: 53d90de 821e177 Author: Brad KingAuthorDate: Tue Oct 6 10:59:08 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:59:08 2015 -0400 Merge topic 'FindOpenSSL-msvc-static-rt' 821e1778 FindOpenSSL: Add support for static MSVC runtime --- Summary of changes: Help/release/dev/FindOpenSSL-msvc-static-rt.rst |6 ++ Modules/FindOpenSSL.cmake | 17 - 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 Help/release/dev/FindOpenSSL-msvc-static-rt.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [cmake-developers] [Review request] TopicFind GTK2_sigc++_c++11
On 10/06/2015 07:51 AM, Daniele E. Domenichelli wrote: > According to the sigc++ changelog, starting with version 2.5.1, sigc++ > requires c++11 enabled, hence this patch. Thanks. > +* Starting with sigc++ 2.5.1, c++11 must be enabled in order to use > + sigc++. Generally we don't do release notes for bug fixes, but this is somewhat of a new feature since it enables C++11 automatically for the client project. Please word the release note as a feature that the imported target provides. > +set_property(TARGET GTK2::sigc++ PROPERTY > INTERFACE_COMPILE_FEATURES cxx_alias_templates cxx_lambdas) Nice. Please add a comment to explain that these are the features needed by clients in order to include the project headers. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [CMake] [ANNOUNCE] CMake 3.4.0-rc1 is now ready!
On 10/06/2015 09:42 AM, Robert Maynard wrote: I am proud to announce the first CMake 3.4 release candidate. This appears to have broken plplot's ada build on Fedora. Previous good (cmake 3.3.2): [ 22%] Building Ada object examples/ada/CMakeFiles/x00a.dir/x00a.o cd /builddir/build/BUILD/plplot-5.11.1/fedora/examples/ada && /usr/bin/gnatgcc -I/builddir/build/BUILD/plplot-5.11.1/fedora/examples/ada -I/builddir/build/BUILD/plplot-5.11.1/bindings/ada-c /builddir/build/BUILD/plplot-5.11.1/examples/ada/x00a.adb -o CMakeFiles/x00a.dir/x00a.o New bad: [ 22%] Building Ada object examples/ada/CMakeFiles/x00a.dir/x00a.o cd /builddir/build/BUILD/plplot-5.11.1/fedora/examples/ada && /usr/bin/gnatgcc -c /builddir/build/BUILD/plplot-5.11.1/examples/ada/x00a.adb -o CMakeFiles/x00a.dir/x00a.o x00a.adb:28:05: file "plplot_auxiliary.ads" not found x00a.adb:29:05: file "plplot_traditional.ads" not found examples/ada/CMakeFiles/x00a.dir/build.make:65: recipe for target 'examples/ada/CMakeFiles/x00a.dir/x00a.o' failed So we're now missing the -I include dir options. That's all I have for now, I'll try to take a closer look later. -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA/CoRA DivisionFAX: 303-415-9702 3380 Mitchell Lane or...@cora.nwra.com Boulder, CO 80301 http://www.cora.nwra.com -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-39-g2c4f902
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 2c4f9023360103ca7489ef821038c3b64a5415fc (commit) from 256bf8876a2e460afc37dbe17eb34482944be20b (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=2c4f9023360103ca7489ef821038c3b64a5415fc commit 2c4f9023360103ca7489ef821038c3b64a5415fc Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Wed Oct 7 00:01:07 2015 -0400 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Oct 7 00:01:07 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d36e648..a4b06d4 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 4) -set(CMake_VERSION_PATCH 20151006) +set(CMake_VERSION_PATCH 20151007) #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.4.0-rc1-86-g3d6c305
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 3d6c305c4e458276e6ebadfe88a3ca2a88c7e010 (commit) via b520b1ca4ec3d51a031d44a25080931c5bb73b83 (commit) via 26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc (commit) from 5636a8971908bd663f148081401cf48725bcf71c (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=3d6c305c4e458276e6ebadfe88a3ca2a88c7e010 commit 3d6c305c4e458276e6ebadfe88a3ca2a88c7e010 Merge: 5636a89 b520b1c Author: Brad KingAuthorDate: Tue Oct 6 13:59:28 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 13:59:28 2015 -0400 Merge topic 'release-nightly-linux64' into next b520b1ca Tests: Add a nightly Linux 64-bit binary 26a0b52d Tests: Rename Linux nightly release binary test to Linux32 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b520b1ca4ec3d51a031d44a25080931c5bb73b83 commit b520b1ca4ec3d51a031d44a25080931c5bb73b83 Author: Brad King AuthorDate: Tue Oct 6 13:58:45 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 13:58:45 2015 -0400 Tests: Add a nightly Linux 64-bit binary diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 2b23360..3f28c25 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -691,6 +691,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release dashmacmini5_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 magrathea_release.cmake) +ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 + linux64_release.cmake) endif() # add tests with more complex invocations https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc commit 26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc Author: Brad King AuthorDate: Tue Oct 6 13:56:19 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 13:56:19 2015 -0400 Tests: Rename Linux nightly release binary test to Linux32 Distinguish the name from a future 64-bit nightly binary. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 1861d82..2b23360 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -689,7 +689,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release dash2win64_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX dashmacmini5_release.cmake) -ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux +ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 magrathea_release.cmake) endif() --- Summary of changes: Tests/CMakeLists.txt |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[CMake] FindCUDA discard any previous value of CUDA_USE_STATIC_CUDA_RUNTIME
Hello. I am using cmake 3.3.2. The following script sets the CUDA_USE_STATIC_CUDA_RUNTIME option, then finds the CUDA package. cmake_minimum_required(VERSION 3.3) option(CUDA_USE_STATIC_CUDA_RUNTIME OFF) set(CUDA_TOOLKIT_ROOT_DIR "d:/work/CUDAToolkit") message(STATUS CUDA_USE_STATIC_CUDA_RUNTIME=${CUDA_USE_STATIC_CUDA_RUNTIME}) find_package(CUDA) message(STATUS CUDA_USE_STATIC_CUDA_RUNTIME=${CUDA_USE_STATIC_CUDA_RUNTIME}) In the find_package, the variable CUDA_TOOLKIT_ROOT_DIR is compared to the variable CUDA_TOOLKIT_ROOT_DIR_INTERNAL (line 556). Since this variable is not defined, the cuda_unset_include_and_libraries function is called. This function wipes the CUDA_USE_STATIC_CUDA_RUNTIME option from the cache. In order to correctly set this variable, I need to restart change it back to OFF, then the FindCUDA script doesn't call cuda_unset_include_and_libraries function. Thibaut. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [cmake-developers] CXX_STANDARD and linking
On Sun, Oct 04, 2015 at 16:47:40 +0200, Stephen Kelly wrote: > The existing CMake feature deals with compilation, but does not deal with > linking. A generic target_link_options() is necessary for other things as well, such as: * -fsanitize=address needs to be passed to the linker to add -lasan (similar for other sanitizers); * -pg -ftest-coverage -fprofile-arcs needs to be passed to the linker for adding profiling information. --Ben -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-101-gc54c869
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 c54c869a7127352d7e2ca757c5ecd039d12ae2ab (commit) via 2921944e08dbe5ed51d3b402ab08c49966b26ed5 (commit) via faa703b091317c76afaa8432c86f7abf8a31d53f (commit) via 092c8f35b6e9c0c2c468cc449fabaa81d574ca40 (commit) via e804e2824f44d1cc86d0dca8a6aef9b179dfa6dd (commit) via 3fb8a61ed3ff288ea404bce4b0ccda047ddaa977 (commit) via 18be18f060e897bc51acd04d0e3e7c9f2c93ecfc (commit) via 2bb6c801a18a0e7672b991dbdc1efd879116747d (commit) via 5eeb043fb2b9febef44771855d14ea6acf63d5dd (commit) via 788c3cc9e8eb4777c0146d63d8d994456ac51d19 (commit) via 41eef9ccc94f1d6c4cff0c45f02ebcdbdf185725 (commit) via 156bd2c983b439478dff5fe84629b5a93e780a92 (commit) via 01e666c70e9c83ebd8c200d121b706868f69e617 (commit) via bf28b7874b999224782fac72c5a74020bd6c47d3 (commit) via 9d653f9c1cc129be4fdce7f0e93c282760c7603e (commit) from 3d6c305c4e458276e6ebadfe88a3ca2a88c7e010 (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=c54c869a7127352d7e2ca757c5ecd039d12ae2ab commit c54c869a7127352d7e2ca757c5ecd039d12ae2ab Merge: 3d6c305 2921944 Author: Stephen KellyAuthorDate: Tue Oct 6 16:03:39 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 16:03:39 2015 -0400 Merge topic 'cmGeneratorTarget-sources' into next 2921944e cmTarget: Remove Compute method. faa703b0 cmGeneratorTarget: Move computed sources from cmTarget. 092c8f35 cmGeneratorTarget: Inline GetSourceFiles from cmTarget. e804e282 cmGeneratorTarget: Move AddInterfaceEntries method. 3fb8a61e cmTarget: Remove a conditional for generate-time source addition. 18be18f0 cmTarget: Split storage of sources from genexes. 2bb6c801 cmTarget: Add Compute API for sources. 5eeb043f cmTarget: Add API for generate-time source addition. 788c3cc9 cmGeneratorTarget: Add methods for generate-time source addition. 41eef9cc Access sources through cmGeneratorTarget. 156bd2c9 Xcode: Port away from unnecessary CMP0049 compatibility. 01e666c7 cmTarget: Join strings conditionally. bf28b787 cmGeneratorTarget: Rename internal member. 9d653f9c cmFLTKWrapUI: Remove CMake 2.2 compat code. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2921944e08dbe5ed51d3b402ab08c49966b26ed5 commit 2921944e08dbe5ed51d3b402ab08c49966b26ed5 Author: Stephen Kelly AuthorDate: Sat Sep 12 21:54:02 2015 +0200 Commit: Stephen Kelly CommitDate: Tue Oct 6 22:02:19 2015 +0200 cmTarget: Remove Compute method. The following tests FAILED: 146 - Qt5Autogen (Failed) 148 - Qt4Autogen (Failed) 298 - RunCMake.set_property (Failed) 314 - RunCMake.File_Generate (Failed) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index a62d534..db842b0 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1538,7 +1538,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes, ti != targets.end(); ++ti) { cmTarget* t = >second; - t->Compute(); cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg); this->GeneratorTargets[t] = gt; generatorTargets[t] = gt; diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 5bace47..ab9d7e7 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -254,7 +254,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget() mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false, no_working_directory, no_depends, noCommandLines); - tgt->Compute(); cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg); mf->AddGeneratorTarget(tgt, gt); diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index fd2d33a..d45aa27 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -86,7 +86,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets() no_depends, no_commands, false, "Build all projects"); - allBuild->Compute(); cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]); allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt); diff --git a/Source/cmGlobalXCodeGenerator.cxx
[CMake] Release and Debug build linking
I am looking for a way to tell my project to link against external debug libraries with a debug build and external release libraries with a release build with Visual Studio. I sort of want to be able to say something like if (BuildingReleaseConfig) find_package(OtherPackage REQUIRED COMPONENTS one two three PATHS OtherPkgDir/Release) endif() if (BuildingDebugConfig) find_package(OtherPackage REQUIRED COMPONENTS oned twod threed PATHS OtherPkgDir/Debug) endif() the idea is that the if () tells CMake which build configuration the find_package results should go into. Is there any way to tell CMake what to write into each VS configuration? I realize the traditional CMake way is to create only one build at a time and specify CMAKE_BUILD_TYPE, but we seem to have stepped beyond that with the Visual Studio generator. Lee -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-110-g884ba71
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 884ba71d96fe4b62336f61c367f8cf785e3842df (commit) via 4553ab7075c7d87914cf45d714c7a3b995242d6d (commit) from 4a19e497cbdd9e2a17a259e0004f015af87f51fc (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=884ba71d96fe4b62336f61c367f8cf785e3842df commit 884ba71d96fe4b62336f61c367f8cf785e3842df Merge: 4a19e49 4553ab7 Author: Stephen KellyAuthorDate: Tue Oct 6 16:38:01 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 16:38:01 2015 -0400 Merge topic 'cmGeneratorTarget-sources' into next 4553ab70 Port GHS. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4553ab7075c7d87914cf45d714c7a3b995242d6d commit 4553ab7075c7d87914cf45d714c7a3b995242d6d Author: Stephen Kelly AuthorDate: Tue Oct 6 22:37:39 2015 +0200 Commit: Stephen Kelly CommitDate: Tue Oct 6 22:37:39 2015 +0200 Port GHS. diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index b1e05c9..bfcef43 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -27,7 +27,7 @@ cmGhsMultiTargetGenerator::cmGhsMultiTargetGenerator(cmGeneratorTarget *target) , LocalGenerator(static_cast( target->GetLocalGenerator())) , Makefile(target->Target->GetMakefile()) - , TargetGroup(DetermineIfTargetGroup(target->Target)) + , TargetGroup(DetermineIfTargetGroup(target)) , DynamicDownload(false) { this->RelBuildFilePath = this->GetRelBuildFilePath(target->Target); @@ -178,10 +178,11 @@ std::vector cmGhsMultiTargetGenerator::GetSources() const GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag() const { - return cmGhsMultiTargetGenerator::GetGpjTag(this->Target); + return cmGhsMultiTargetGenerator::GetGpjTag(this->GeneratorTarget); } -GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag(const cmTarget *target) +GhsMultiGpj::Types cmGhsMultiTargetGenerator::GetGpjTag( +const cmGeneratorTarget *target) { GhsMultiGpj::Types output; if (cmGhsMultiTargetGenerator::DetermineIfTargetGroup(target)) @@ -566,15 +567,14 @@ bool cmGhsMultiTargetGenerator::IsNotKernel(std::string const , return output; } -bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup(const cmTarget *target) +bool cmGhsMultiTargetGenerator::DetermineIfTargetGroup( +const cmGeneratorTarget *target) { bool output = false; std::vector sources; std::string config = - target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"); - cmGeneratorTarget* gt = - this->GetGlobalGenerator()->GetGeneratorTarget(target); - gt->GetSourceFiles(sources, config); + target->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"); + target->GetSourceFiles(sources, config); for (std::vector::const_iterator sources_i = sources.begin(); sources.end() != sources_i; ++sources_i) { diff --git a/Source/cmGhsMultiTargetGenerator.h b/Source/cmGhsMultiTargetGenerator.h index c29a31e..d1c17f4 100644 --- a/Source/cmGhsMultiTargetGenerator.h +++ b/Source/cmGhsMultiTargetGenerator.h @@ -36,7 +36,7 @@ public: bool IncludeThisTarget(); std::vector GetSources() const; GhsMultiGpj::Types GetGpjTag() const; - static GhsMultiGpj::Types GetGpjTag(const cmTarget *target); + static GhsMultiGpj::Types GetGpjTag(const cmGeneratorTarget* target); const char *GetAbsBuildFilePath() const { return this->AbsBuildFilePath.c_str(); @@ -95,7 +95,7 @@ private: std::string GetOutputFilename(const std::string ) const; bool IsNotKernel(std::string const , const std::string ); - static bool DetermineIfTargetGroup(const cmTarget *target); + static bool DetermineIfTargetGroup(const cmGeneratorTarget* target); bool DetermineIfDynamicDownload(std::string const , const std::string ); --- Summary of changes: Source/cmGhsMultiTargetGenerator.cxx | 16 Source/cmGhsMultiTargetGenerator.h |4 ++-- 2 files changed, 10 insertions(+), 10 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.4.0-rc1-106-g4eafc01
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 4eafc01acb0a24effedaa6b1f9d798a8f971d852 (commit) via 852e9b1b54d755dda1e8ca131c7aed247e8ab311 (commit) via 86db10d78e429b9a934649c15d2cad91c1860576 (commit) via 09898c15aacbeda92f34721c3283c730d00a66c3 (commit) via f716460ed82134bd1ca09f49bfa507cb2645d96c (commit) from c54c869a7127352d7e2ca757c5ecd039d12ae2ab (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=4eafc01acb0a24effedaa6b1f9d798a8f971d852 commit 4eafc01acb0a24effedaa6b1f9d798a8f971d852 Merge: c54c869 852e9b1 Author: Stephen KellyAuthorDate: Tue Oct 6 16:04:50 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 16:04:50 2015 -0400 Merge topic 'refactor-current-dir-initialization' into next 852e9b1b cmState: Internalize the initialization of a snapshot from its parent. 86db10d7 Remove now-unused directory setters. 09898c15 Set the current dirs on the snapshot before creating the cmMakefile. f716460e cmMakefile: Move invokation to initialize snapshot. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=852e9b1b54d755dda1e8ca131c7aed247e8ab311 commit 852e9b1b54d755dda1e8ca131c7aed247e8ab311 Author: Stephen Kelly AuthorDate: Tue Oct 6 00:33:49 2015 +0200 Commit: Stephen Kelly CommitDate: Tue Oct 6 21:50:44 2015 +0200 cmState: Internalize the initialization of a snapshot from its parent. diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 2c9dfbb..c060505 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1761,8 +1761,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, this->ContextStack.back()->Name, this->ContextStack.back()->Line); - newSnapshot.InitializeFromParent(); - newSnapshot.GetDirectory().SetCurrentSource(srcPath); newSnapshot.GetDirectory().SetCurrentBinary(binPath); diff --git a/Source/cmState.cxx b/Source/cmState.cxx index ce9ff32..db7519b 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -805,8 +805,10 @@ cmState::CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot, pos->Parent = origin; pos->Root = origin; pos->Vars = this->VarTree.Extend(origin); + cmState::Snapshot snapshot = cmState::Snapshot(this, pos); originSnapshot.Position->BuildSystemDirectory->Children.push_back(snapshot); + snapshot.InitializeFromParent(); return snapshot; } diff --git a/Source/cmState.h b/Source/cmState.h index 99e537c..1ffc4bf 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -75,8 +75,6 @@ public: Snapshot GetCallStackParent() const; SnapshotType GetType() const; -void InitializeFromParent(); - void SetPolicy(cmPolicies::PolicyID id, cmPolicies::PolicyStatus status); cmPolicies::PolicyStatus GetPolicy(cmPolicies::PolicyID id) const; bool HasDefinedPolicyCMP0011(); @@ -105,6 +103,9 @@ public: friend class cmState; friend class Directory; friend struct StrictWeakOrder; + +void InitializeFromParent(); + cmState* State; cmState::PositionType Position; }; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86db10d78e429b9a934649c15d2cad91c1860576 commit 86db10d78e429b9a934649c15d2cad91c1860576 Author: Stephen Kelly AuthorDate: Tue Oct 6 00:24:26 2015 +0200 Commit: Stephen Kelly CommitDate: Tue Oct 6 21:49:51 2015 +0200 Remove now-unused directory setters. diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 11a949f..2c9dfbb 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1784,26 +1784,11 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, } } -void cmMakefile::SetCurrentSourceDirectory(const std::string& dir) -{ - this->StateSnapshot.GetDirectory().SetCurrentSource(dir); - this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", - this->StateSnapshot.GetDirectory().GetCurrentSource()); -} - const char* cmMakefile::GetCurrentSourceDirectory() const { return this->StateSnapshot.GetDirectory().GetCurrentSource(); } -void cmMakefile::SetCurrentBinaryDirectory(const std::string& dir) -{ - this->StateSnapshot.GetDirectory().SetCurrentBinary(dir); - const char* binDir = this->StateSnapshot.GetDirectory().GetCurrentBinary(); - cmSystemTools::MakeDirectory(binDir); - this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", binDir); -} - const char*
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-108-g4a19e49
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 4a19e497cbdd9e2a17a259e0004f015af87f51fc (commit) via f51ef97b068d174ecc502374dacf5b5559069499 (commit) from 4eafc01acb0a24effedaa6b1f9d798a8f971d852 (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=4a19e497cbdd9e2a17a259e0004f015af87f51fc commit 4a19e497cbdd9e2a17a259e0004f015af87f51fc Merge: 4eafc01 f51ef97 Author: Stephen KellyAuthorDate: Tue Oct 6 16:14:12 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 16:14:12 2015 -0400 Merge topic 'refactor-current-dir-initialization' into next f51ef97b fixup! Set the current dirs on the snapshot before creating the cmMakefile. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f51ef97b068d174ecc502374dacf5b5559069499 commit f51ef97b068d174ecc502374dacf5b5559069499 Author: Stephen Kelly AuthorDate: Tue Oct 6 22:13:31 2015 +0200 Commit: Stephen Kelly CommitDate: Tue Oct 6 22:13:31 2015 +0200 fixup! Set the current dirs on the snapshot before creating the cmMakefile. diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 183b6e7..fececfd 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -381,6 +381,7 @@ void cmake::ReadListFile(const std::vector& args, (cmSystemTools::GetCurrentWorkingDirectory()); snapshot.GetDirectory().SetCurrentSource (cmSystemTools::GetCurrentWorkingDirectory()); +cmsys::auto_ptr mf(new cmMakefile(gg, snapshot)); if (this->GetWorkingMode() != NORMAL_MODE) { std::string file(cmSystemTools::CollapseFullPath(path)); --- Summary of changes: Source/cmake.cxx |1 + 1 file changed, 1 insertion(+) 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-122-g4497396
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 449739634258340947548467f73cc8c3479c2e90 (commit) via 947611f7d1d00bd7a3004104ea5a84e5bdd3d16d (commit) via 2f34cdd3793bfc53947f2bd6f5032523196c2943 (commit) via b8d23e48a296e308a31717ab213b9661adf133e1 (commit) via ff83742a8e8cf9443b08406a696aad8c70db8430 (commit) via c1bf5253ab99e76c5ba8e67ebab1256ed97142a0 (commit) via c4589e5dff619a2f0ff7c102fd8f9c012f2b01fd (commit) via e6de22ed27da0eb141f099b15fc7eab3cf738731 (commit) via dc581a1e0cc0186fcdc0d9ccc3f09c814eca700f (commit) via f1011833f215daee03dc861ed50eb0d75500c4b2 (commit) via 97d89bdfb52435323eb8922dda92cd9198397df0 (commit) via a9008a9b2c302d9a0b7deecb35e8a3d6291f0830 (commit) from 884ba71d96fe4b62336f61c367f8cf785e3842df (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=449739634258340947548467f73cc8c3479c2e90 commit 449739634258340947548467f73cc8c3479c2e90 Merge: 884ba71 947611f Author: Stephen KellyAuthorDate: Tue Oct 6 16:38:38 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 16:38:38 2015 -0400 Merge topic 'cmGeneratorTarget-sources' into next 947611f7 cmTarget: Remove Compute method. 2f34cdd3 cmGeneratorTarget: Move computed sources from cmTarget. b8d23e48 cmGeneratorTarget: Inline GetSourceFiles from cmTarget. ff83742a cmGeneratorTarget: Move AddInterfaceEntries method. c1bf5253 cmTarget: Remove a conditional for generate-time source addition. c4589e5d cmTarget: Split storage of sources from genexes. e6de22ed cmTarget: Add Compute API for sources. dc581a1e cmTarget: Add API for generate-time source addition. f1011833 cmGeneratorTarget: Add methods for generate-time source addition. 97d89bdf Access sources through cmGeneratorTarget. a9008a9b GHS: Port API to cmGeneratorTarget. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=947611f7d1d00bd7a3004104ea5a84e5bdd3d16d commit 947611f7d1d00bd7a3004104ea5a84e5bdd3d16d Author: Stephen Kelly AuthorDate: Sat Sep 12 21:54:02 2015 +0200 Commit: Stephen Kelly CommitDate: Tue Oct 6 22:36:02 2015 +0200 cmTarget: Remove Compute method. The following tests FAILED: 146 - Qt5Autogen (Failed) 148 - Qt4Autogen (Failed) 298 - RunCMake.set_property (Failed) 314 - RunCMake.File_Generate (Failed) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index a62d534..db842b0 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1538,7 +1538,6 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes, ti != targets.end(); ++ti) { cmTarget* t = >second; - t->Compute(); cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg); this->GeneratorTargets[t] = gt; generatorTargets[t] = gt; diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 5bace47..ab9d7e7 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -254,7 +254,6 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget() mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false, no_working_directory, no_depends, noCommandLines); - tgt->Compute(); cmGeneratorTarget* gt = new cmGeneratorTarget(tgt, lg); mf->AddGeneratorTarget(tgt, gt); diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index fd2d33a..d45aa27 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -86,7 +86,6 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets() no_depends, no_commands, false, "Build all projects"); - allBuild->Compute(); cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]); allBuild->GetMakefile()->AddGeneratorTarget(allBuild, gt); diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 14bc340..3d52e3a 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -456,7 +456,6 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root, no_working_directory, "echo", "Build all projects"); - allbuild->Compute(); cmGeneratorTarget*
Re: [CMake] Release and Debug build linking
CMake supports multi-config generators such as Visual Studio and Xcode for a long time. There are two flavors of config-modules (and find-modules), the legacy one which creates variables like MY_PACKAGE_LIBRARIES and the install-export kind which creates IMPORTED targets. Both kinds of modules support providing Debug and Release versions of the same library from a single find-module or config-module. So if your package's find-module or config-module is written correctly you don't need any if's just a single find_package(). Tamas On Tue, Oct 6, 2015 at 10:21 PM, Lee Butlerwrote: > I am looking for a way to tell my project to link against external debug > libraries with a debug build and external release libraries with a release > build with Visual Studio. > > I sort of want to be able to say something like > if (BuildingReleaseConfig) > find_package(OtherPackage REQUIRED COMPONENTS one two three PATHS > OtherPkgDir/Release) > endif() > > if (BuildingDebugConfig) > find_package(OtherPackage REQUIRED COMPONENTS oned twod threed PATHS > OtherPkgDir/Debug) > endif() > > the idea is that the if () tells CMake which build configuration the > find_package results should go into. Is there any way to tell CMake what > to write into each VS configuration? > > I realize the traditional CMake way is to create only one build at a time > and specify CMAKE_BUILD_TYPE, but we seem to have stepped beyond that with > the Visual Studio generator. > > Lee > -- > > Powered by www.kitware.com > > Please keep messages on-topic and check the CMake FAQ at: > http://www.cmake.org/Wiki/CMake_FAQ > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit: > > CMake Support: http://cmake.org/cmake/help/support.html > CMake Consulting: http://cmake.org/cmake/help/consulting.html > CMake Training Courses: http://cmake.org/cmake/help/training.html > > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > > Follow this link to subscribe/unsubscribe: > http://public.kitware.com/mailman/listinfo/cmake > -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-125-g3af63d1
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 3af63d13e8827bf86b53a85376c5f76a67604e4f (commit) via 461a70ec71dffdd5fa390ed8171b9cd2d14e0070 (commit) via c6dc5dd0186349d32e756dc2e8f877567bdc0e3c (commit) from 449739634258340947548467f73cc8c3479c2e90 (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=3af63d13e8827bf86b53a85376c5f76a67604e4f commit 3af63d13e8827bf86b53a85376c5f76a67604e4f Merge: 4497396 461a70e Author: Stephen KellyAuthorDate: Tue Oct 6 17:32:36 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 17:32:36 2015 -0400 Merge topic 'cmGeneratorTarget-sources' into next 461a70ec fixup! Access sources through cmGeneratorTarget. c6dc5dd0 fixup! GHS: Port API to cmGeneratorTarget. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=461a70ec71dffdd5fa390ed8171b9cd2d14e0070 commit 461a70ec71dffdd5fa390ed8171b9cd2d14e0070 Author: Stephen Kelly AuthorDate: Tue Oct 6 23:32:14 2015 +0200 Commit: Stephen Kelly CommitDate: Tue Oct 6 23:32:14 2015 +0200 fixup! Access sources through cmGeneratorTarget. diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index 8c874f5..87cf58f 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -521,8 +521,7 @@ bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt) const std::string config = tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"); std::vector tgtSources; - cmGeneratorTarget* gt = - this->GetGlobalGenerator()->GetGeneratorTarget(tgt); + cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt); gt->GetSourceFiles(tgtSources, config); bool tgtInBuild = true; char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL"); https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6dc5dd0186349d32e756dc2e8f877567bdc0e3c commit c6dc5dd0186349d32e756dc2e8f877567bdc0e3c Author: Stephen Kelly AuthorDate: Tue Oct 6 23:30:39 2015 +0200 Commit: Stephen Kelly CommitDate: Tue Oct 6 23:30:55 2015 +0200 fixup! GHS: Port API to cmGeneratorTarget. diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index e66bc2a..8c874f5 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -509,7 +509,8 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles( splitPath.back()); *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile << " "; - GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag(tgt), + GhsMultiGpj::WriteGpjTag(cmGhsMultiTargetGenerator::GetGpjTag( + tgtsI->second), this->TargetFolderBuildStreams[folderName]); } } --- Summary of changes: Source/cmGlobalGhsMultiGenerator.cxx |6 +++--- 1 file 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
Re: [cmake-developers] added get_git_revision and get_git_branch commands as follow-up to cm...@cmake.org
On Mon, Oct 05, 2015 at 12:50:41 +0200, Daniel Wirtz wrote: > thanks for the feedback, i've included most of it. > > Regarding the configure/build issue: that indeed is inconvenient and may > cause irritation. on the other side, if there has been git activity > fussing with any source files affecting the build, cmake will run again > and hence capture the possibly new git info. so the case where you > change the revision after configure to an extent where cmake will not > automatically re-run is uncommon, at least for my guessing. > however, i've included an explicit warning in the docs to raise awareness. Well, without depending on every file in the source tree, it will just be wrong rather than causing excess configure runs. Adding something like "configure this file at build time" setup would need to be the basis though (basically porting and cleaning up sprokit_configure_file() into CMake as deferred_configure_file() or something similar would work). > i'm happy to provide a suitable procedure that is flexible enough; > providing scripts that configure files (like with sprokit) seems too > specific as people might want to have a single "config.h" file or so > containing more than just the git info. The sprokit mechanism configures any file using code to determine some of the variables at build time. It is by no means limited to just header files. The code injection is a little clunky (being a string and all), but it could also be changed to an include() statement with an extra depends on that included file. In fact, with include(), adding support for SVN, Mercurial and others would be pretty simple as well rather than duplicating all this for each revision system. > i've thought about the possibility to generate an explicit > "git_version.h" file to include, but that 1) restricts possible > languages and 2) will require an extra build target that is run each > build etc. any thoughts? Well, you will indeed never have a "nothing to do" build with such a target, but such information is effectively derived from "this depends on every file in the tree tracked by git as well as the .git/HEAD, .git/index, and .git/refs/tags/* files" so "always something to do" isn't that far off. The step (in sprokit) takes ~0 time to run anyways[1], so speed isn't an issue. --Ben [1]45 build trees took < 2 seconds, so figuring for some overhead for exec() of ninja itself and ninja scanning, the overhead for checking the git revision is < .05s for a smallish source tree. Something like webkit's git mirror could take a while though. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [CMake] Release and Debug build linking
So if this is the case, how does one "write correctly" the find/config module so that both debug and release libraries are found? I've got a library I depend on whose maintainer may not have built the best Find module in the world. I've looked at https://cmake.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file already. It doesn't seem to address picking up both release and debug libraries. I gather from another example that the goal is to create a list of the form: optimized;foolib.lib;debug;foolibd.lib and provide that in the FOO_LIBRARY variable? -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Removing duplicate entries from CXXFLAGS
CMake performs deduplication of per-target flags for sure. However I'm not sure if CMAKE_CXX_FLAGS is deduplicated. But I consider this variable as global flags for the whole project which is defined at topmost CMakeLists.txt. If you need to specify some flags specifically for a target use target_compile_options. — Sent from Mailbox On Mon, Oct 5, 2015 at 4:23 PM, Attila Krasznahorkaywrote: > Dear All, > Let me try a simpler question this time. (I'm a bit disappointed that nobody > had any comments on my question about sub-projects.) > I'm trying to clean up my project's build a bit. As it collects compilation > flags from a few separate places, by the time it finishes collecting > everything, the compilation commands are usually very long. As they have many > duplications. Like: > -m64 -pipe -W > -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments > -pthread -std=c++11 -Wno-deprecated-declaration > s -stdlib=libc++ -m64 -pipe -W -Wall -Woverloaded-virtual -fsigned-char > -fno-common -Qunused-arguments -pthread -std=c++ > 11 -Wno-deprecated-declarations -stdlib=libc++ -Wno-unused-local-typedefs > -Wno-tautological-undefined-compare -Wno-incon > sistent-missing-override -m64 -pipe -W -Wall -Woverloaded-virtual > -fsigned-char -fno-common -Qunused-arguments -pthread > -std=c++11 -Wno-deprecated-declarations -stdlib=libc++ -m64 -pipe -W -Wall > -Woverloaded-virtual -fsigned-char -fno-commo > n -Qunused-arguments -pthread -std=c++11 -Wno-deprecated-declarations > -stdlib=libc++ -m64 -pipe -W -Wall -Woverloaded-vi > rtual -fsigned-char -fno-common -Qunused-arguments -pthread -std=c++11 > -Wno-deprecated-declarations -stdlib=libc++ -m64 > -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common > -Qunused-arguments -pthread -std=c++11 -Wno-deprecated-dec > larations -stdlib=libc++ -m64 -pipe -fsigned-char -fno-common > -Qunused-arguments -pthread -std=c++11 -stdlib=libc++ > Naturally it would help the build log reading tremendously if I could remove > the duplications from these lines. But I can't find a good way of doing it. > How could I weed out all the duplications in the CXXFLAGS associated to a > given target? > Cheers, > Attila > -- > Powered by www.kitware.com > Please keep messages on-topic and check the CMake FAQ at: > http://www.cmake.org/Wiki/CMake_FAQ > Kitware offers various services to support the CMake community. For more > information on each offering, please visit: > CMake Support: http://cmake.org/cmake/help/support.html > CMake Consulting: http://cmake.org/cmake/help/consulting.html > CMake Training Courses: http://cmake.org/cmake/help/training.html > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > Follow this link to subscribe/unsubscribe: > http://public.kitware.com/mailman/listinfo/cmake-- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [cmake-developers] automatically download library
On Oct 6, 2015, at 7:22 AM, Марсель Галимуллин wrote: > I'm student of the University LETI and as a masrer's thesis I want to develop > an extension to CMake. It is expected that this extension will automatically > download missing library if instruction such as «find_package (Boost > COMPONENTS system thread REQUIRED)» can not find the package. Could you give > me some advices where to begin and which the best direction to design, > develop and whether to do it? If you need that for some special purpose, go for it, but it's probably not a behavior most users would expect, and it's definitely a behavior that would have to be disabled in any software installed by a package management system. (The package management system would want to be in control of what gets downloaded.) -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[Cmake-commits] CMake branch, next, updated. v3.3.2-1475-g93d9a39
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 93d9a39bcf9942e5763a2c67c2f100053c057eb8 (commit) via 8bb908b1084b5db1a6f8197a4d26b67984587ee4 (commit) from 8b9266c92d3b6f2cc33ccc113a367fea04f31ba4 (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=93d9a39bcf9942e5763a2c67c2f100053c057eb8 commit 93d9a39bcf9942e5763a2c67c2f100053c057eb8 Merge: 8b9266c 8bb908b Author: Brad KingAuthorDate: Tue Oct 6 09:34:38 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 09:34:38 2015 -0400 Merge topic 'cmake-script-mode-directory-vars' into next 8bb908b1 Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bb908b1084b5db1a6f8197a4d26b67984587ee4 commit 8bb908b1084b5db1a6f8197a4d26b67984587ee4 Author: Tamas Kenez AuthorDate: Mon Oct 5 22:12:30 2015 +0200 Commit: Brad King CommitDate: Tue Oct 6 09:34:28 2015 -0400 Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode diff --git a/Help/variable/CMAKE_BINARY_DIR.rst b/Help/variable/CMAKE_BINARY_DIR.rst index f8dd8ab..3b323b7 100644 --- a/Help/variable/CMAKE_BINARY_DIR.rst +++ b/Help/variable/CMAKE_BINARY_DIR.rst @@ -6,3 +6,8 @@ The path to the top level of the build tree. This is the full path to the top level of the current CMake build tree. For an in-source build, this would be the same as :variable:`CMAKE_SOURCE_DIR`. + +When run in -P script mode, CMake sets the variables +:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, +:variable:`CMAKE_CURRENT_BINARY_DIR` and +:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory. diff --git a/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst b/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst index cc3b639..40496b5 100644 --- a/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst +++ b/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst @@ -8,3 +8,8 @@ processed by cmake. Each directory added by :command:`add_subdirectory` will create a binary directory in the build tree, and as it is being processed this variable will be set. For in-source builds this is the current source directory being processed. + +When run in -P script mode, CMake sets the variables +:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, +:variable:`CMAKE_CURRENT_BINARY_DIR` and +:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory. diff --git a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst index db063a4..c1b755a 100644 --- a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst +++ b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst @@ -5,3 +5,8 @@ The path to the source directory currently being processed. This the full path to the source directory that is currently being processed by cmake. + +When run in -P script mode, CMake sets the variables +:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, +:variable:`CMAKE_CURRENT_BINARY_DIR` and +:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory. diff --git a/Help/variable/CMAKE_SOURCE_DIR.rst b/Help/variable/CMAKE_SOURCE_DIR.rst index 3df0226..416fbe1 100644 --- a/Help/variable/CMAKE_SOURCE_DIR.rst +++ b/Help/variable/CMAKE_SOURCE_DIR.rst @@ -6,3 +6,8 @@ The path to the top level of the source tree. This is the full path to the top level of the current CMake source tree. For an in-source build, this would be the same as :variable:`CMAKE_BINARY_DIR`. + +When run in -P script mode, CMake sets the variables +:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, +:variable:`CMAKE_CURRENT_BINARY_DIR` and +:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory. diff --git a/Tests/RunCMake/CommandLine/P_working-dir.cmake b/Tests/RunCMake/CommandLine/P_working-dir.cmake new file mode 100644 index 000..4ea0293 --- /dev/null +++ b/Tests/RunCMake/CommandLine/P_working-dir.cmake @@ -0,0 +1,14 @@ +if(NOT IS_DIRECTORY "${EXPECTED_WORKING_DIR}") + message(FATAL_ERROR "EXPECTED_WORKING_DIR is not a directory: ${EXPECTED_WORKING_DIR}") +endif() + +foreach(d CMAKE_BINARY_DIR CMAKE_CURRENT_BINARY_DIR CMAKE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) + if(NOT DEFINED ${d}) +message(FATAL_ERROR "${d} is not defined") + endif() + if(EXPECTED_WORKING_DIR STREQUAL "${${d}}") +message(STATUS "${d} is the expected working directory (${EXPECTED_WORKING_DIR})") + else() +message(FATAL_ERROR "${d} = \"${${d}}\" is not the expected working directory (${EXPECTED_WORKING_DIR})") +
[Cmake-commits] CMake branch, next, updated. v3.3.2-1473-g8b9266c
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 8b9266c92d3b6f2cc33ccc113a367fea04f31ba4 (commit) via 1451bdf2a4f86e88034b29ee7fb604f45b91f956 (commit) from fab3860de1e08981f48638142cb2f85a7e9897df (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=8b9266c92d3b6f2cc33ccc113a367fea04f31ba4 commit 8b9266c92d3b6f2cc33ccc113a367fea04f31ba4 Merge: fab3860 1451bdf Author: Brad KingAuthorDate: Tue Oct 6 09:34:24 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 09:34:24 2015 -0400 Merge topic 'cmake-script-mode-directory-vars' into next 1451bdf2 fixup! Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1451bdf2a4f86e88034b29ee7fb604f45b91f956 commit 1451bdf2a4f86e88034b29ee7fb604f45b91f956 Author: Brad King AuthorDate: Tue Oct 6 09:34:18 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 09:34:18 2015 -0400 fixup! Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode diff --git a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst index 728291e..c1b755a 100644 --- a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst +++ b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst @@ -6,9 +6,6 @@ The path to the source directory currently being processed. This the full path to the source directory that is currently being processed by cmake. -When run in -P script mode, CMake sets this variable to the current -working directory. - When run in -P script mode, CMake sets the variables :variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, :variable:`CMAKE_CURRENT_BINARY_DIR` and diff --git a/Help/variable/CMAKE_SOURCE_DIR.rst b/Help/variable/CMAKE_SOURCE_DIR.rst index 3644bbb..416fbe1 100644 --- a/Help/variable/CMAKE_SOURCE_DIR.rst +++ b/Help/variable/CMAKE_SOURCE_DIR.rst @@ -7,9 +7,6 @@ This is the full path to the top level of the current CMake source tree. For an in-source build, this would be the same as :variable:`CMAKE_BINARY_DIR`. -When run in -P script mode, CMake sets this variable to the current -working directory. - When run in -P script mode, CMake sets the variables :variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, :variable:`CMAKE_CURRENT_BINARY_DIR` and --- Summary of changes: Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst |3 --- Help/variable/CMAKE_SOURCE_DIR.rst |3 --- 2 files changed, 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[cmake-developers] automatically download library
Hello!I'm student of the University LETI and as a masrer's thesis I want to develop an extension to CMake. It is expected that this extension will automatically download missing library if instruction such as «find_package (Boost COMPONENTS system thread REQUIRED)» can not find the package. Could you give me some advices where to begin and which the best direction to design, develop and whether to do it? --Kind regards,Marsel Galimullin. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Issue on CMAKE_OSX_SYSROOT
On 10/06/2015 09:49 AM, Francesco Romano wrote: > - Compilation of the project. > I want the user to be able to compile the project on its machine > (so build system = deployment system). Of course I can document > that he has to explicitly pass the variable to cmake, but it > does not seem too user friendly to me Your project should not be setting CMAKE_OSX_DEPLOYMENT_TARGET in its code. If you don't set this then CMAKE_OSX_SYSROOT is not needed. Both are meant to be set by end users. If the deployment target is their own machine then neither needs to be set and it should just work. > - Brew formula. > I have to use ruby to detect the user platform and configure > the arguments to cmake accordingly. If the build targets the current system then again there is no need to set either variable. Or, you can set both by using a symbolic SDK name rather than the path. For example: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DCMAKE_OSX_SYSROOT=macosx10.9 > I also want to add that this issue arose with Xcode 7. > Indeed Apple ships now (first the first time) only the 10.11 SDK, > even if the system is 10.10. And this is what is causing the issue, > because cmake automatically set the deployment target to match > the sdk and not the build system. Okay, that looks like the underlying issue. The Modules/Platform/Darwin-Initialize.cmake module will have to be taught about this case to do the right thing by default if it does not already. Gregor, do you mind taking a look at this? Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[Cmake-commits] CMake branch, next, updated. v3.3.2-1469-g7581b99
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 7581b99a1b8fd2ae3f4b92c530c73fd35649ccae (commit) via 3758af12fab8bc3c6279400621be94c4aa540a70 (commit) via 3709e950f4ed7545a38c2506c19ee90ee58fa920 (commit) from 6d62f50d47b15612ecfd7d29d9826edea2893d54 (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=7581b99a1b8fd2ae3f4b92c530c73fd35649ccae commit 7581b99a1b8fd2ae3f4b92c530c73fd35649ccae Merge: 6d62f50 3758af1 Author: Brad KingAuthorDate: Tue Oct 6 09:10:06 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 09:10:06 2015 -0400 Merge topic 'cpack-nsis-bitmap' into next 3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side 3709e950 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3758af12fab8bc3c6279400621be94c4aa540a70 commit 3758af12fab8bc3c6279400621be94c4aa540a70 Author: Colin Tracey AuthorDate: Fri Sep 25 15:06:08 2015 -0500 Commit: Brad King CommitDate: Tue Oct 6 09:08:37 2015 -0400 CPackNSIS: Add options to set the bitmap for NSIS installer left side set MUI_WELCOMEFINISHPAGE_BITMAP set MUI_UNWELCOMEFINISHPAGE_BITMAP diff --git a/Help/release/dev/cpack-nsis-bitmap.rst b/Help/release/dev/cpack-nsis-bitmap.rst new file mode 100644 index 000..c5ccfb5 --- /dev/null +++ b/Help/release/dev/cpack-nsis-bitmap.rst @@ -0,0 +1,6 @@ +cpack-nsis-bitmap +- + +* The :module:`CPackNSIS` module learned new variables to add bitmaps to the + installer. See the :variable:`CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP` + and :variable:`CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP` variables. diff --git a/Modules/CPackNSIS.cmake b/Modules/CPackNSIS.cmake index c6b3d19..db5984a 100644 --- a/Modules/CPackNSIS.cmake +++ b/Modules/CPackNSIS.cmake @@ -30,6 +30,14 @@ # # undocumented. # +# .. variable:: CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP +# +# The filename of a bitmap to use as the NSIS MUI_WELCOMEFINISHPAGE_BITMAP. +# +# .. variable:: CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP +# +# The filename of a bitmap to use as the NSIS MUI_UNWELCOMEFINISHPAGE_BITMAP. +# # .. variable:: CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS # # Extra NSIS commands that will be added to the beginning of the install diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index 76310af..1ef3d28 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -542,6 +542,8 @@ FunctionEnd ; Define some macro setting for the gui @CPACK_NSIS_INSTALLER_MUI_ICON_CODE@ @CPACK_NSIS_INSTALLER_ICON_CODE@ +@CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE@ +@CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE@ @CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@ @CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@ diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 6cdda28..705b864 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -158,6 +158,28 @@ int cmCPackNSISGenerator::PackageFiles() installerIconCode.c_str()); } + if (this->IsSet("CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP")) +{ +std::string installerBitmapCode = + "!define MUI_WELCOMEFINISHPAGE_BITMAP \""; +installerBitmapCode += + this->GetOption("CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP"); +installerBitmapCode += "\"\n"; +this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE", +installerBitmapCode.c_str()); +} + + if (this->IsSet("CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP")) +{ +std::string installerBitmapCode = + "!define MUI_UNWELCOMEFINISHPAGE_BITMAP \""; +installerBitmapCode += + this->GetOption("CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP"); +installerBitmapCode += "\"\n"; +this->SetOptionIfNotSet("CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE", +installerBitmapCode.c_str()); +} + if(this->IsSet("CPACK_NSIS_MUI_FINISHPAGE_RUN")) { std::string installerRunCode = "!define MUI_FINISHPAGE_RUN \"$INSTDIR\\"; --- Summary of changes: Help/release/dev/cpack-nsis-bitmap.rst |6 ++ Modules/CPackNSIS.cmake|8 Modules/NSIS.template.in |2 ++ Source/CMakeVersion.cmake |2 +- Source/CPack/cmCPackNSISGenerator.cxx | 22 ++ 5 files
[Cmake-commits] CMake branch, next, updated. v3.3.2-1471-gfab3860
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 fab3860de1e08981f48638142cb2f85a7e9897df (commit) via 3e72e9eb1958a5126146c21679e0812e5bddecd3 (commit) from 7581b99a1b8fd2ae3f4b92c530c73fd35649ccae (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=fab3860de1e08981f48638142cb2f85a7e9897df commit fab3860de1e08981f48638142cb2f85a7e9897df Merge: 7581b99 3e72e9e Author: Brad KingAuthorDate: Tue Oct 6 09:31:25 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 09:31:25 2015 -0400 Merge topic 'cmake-script-mode-directory-vars' into next 3e72e9eb Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e72e9eb1958a5126146c21679e0812e5bddecd3 commit 3e72e9eb1958a5126146c21679e0812e5bddecd3 Author: Tamas Kenez AuthorDate: Mon Oct 5 22:12:30 2015 +0200 Commit: Brad King CommitDate: Tue Oct 6 09:23:32 2015 -0400 Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode diff --git a/Help/variable/CMAKE_BINARY_DIR.rst b/Help/variable/CMAKE_BINARY_DIR.rst index f8dd8ab..3b323b7 100644 --- a/Help/variable/CMAKE_BINARY_DIR.rst +++ b/Help/variable/CMAKE_BINARY_DIR.rst @@ -6,3 +6,8 @@ The path to the top level of the build tree. This is the full path to the top level of the current CMake build tree. For an in-source build, this would be the same as :variable:`CMAKE_SOURCE_DIR`. + +When run in -P script mode, CMake sets the variables +:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, +:variable:`CMAKE_CURRENT_BINARY_DIR` and +:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory. diff --git a/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst b/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst index cc3b639..40496b5 100644 --- a/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst +++ b/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst @@ -8,3 +8,8 @@ processed by cmake. Each directory added by :command:`add_subdirectory` will create a binary directory in the build tree, and as it is being processed this variable will be set. For in-source builds this is the current source directory being processed. + +When run in -P script mode, CMake sets the variables +:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, +:variable:`CMAKE_CURRENT_BINARY_DIR` and +:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory. diff --git a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst index db063a4..728291e 100644 --- a/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst +++ b/Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst @@ -5,3 +5,11 @@ The path to the source directory currently being processed. This the full path to the source directory that is currently being processed by cmake. + +When run in -P script mode, CMake sets this variable to the current +working directory. + +When run in -P script mode, CMake sets the variables +:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, +:variable:`CMAKE_CURRENT_BINARY_DIR` and +:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory. diff --git a/Help/variable/CMAKE_SOURCE_DIR.rst b/Help/variable/CMAKE_SOURCE_DIR.rst index 3df0226..3644bbb 100644 --- a/Help/variable/CMAKE_SOURCE_DIR.rst +++ b/Help/variable/CMAKE_SOURCE_DIR.rst @@ -6,3 +6,11 @@ The path to the top level of the source tree. This is the full path to the top level of the current CMake source tree. For an in-source build, this would be the same as :variable:`CMAKE_BINARY_DIR`. + +When run in -P script mode, CMake sets this variable to the current +working directory. + +When run in -P script mode, CMake sets the variables +:variable:`CMAKE_BINARY_DIR`, :variable:`CMAKE_SOURCE_DIR`, +:variable:`CMAKE_CURRENT_BINARY_DIR` and +:variable:`CMAKE_CURRENT_SOURCE_DIR` to the current working directory. diff --git a/Tests/RunCMake/CommandLine/P_working-dir.cmake b/Tests/RunCMake/CommandLine/P_working-dir.cmake new file mode 100644 index 000..4ea0293 --- /dev/null +++ b/Tests/RunCMake/CommandLine/P_working-dir.cmake @@ -0,0 +1,14 @@ +if(NOT IS_DIRECTORY "${EXPECTED_WORKING_DIR}") + message(FATAL_ERROR "EXPECTED_WORKING_DIR is not a directory: ${EXPECTED_WORKING_DIR}") +endif() + +foreach(d CMAKE_BINARY_DIR CMAKE_CURRENT_BINARY_DIR CMAKE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR) + if(NOT DEFINED ${d}) +message(FATAL_ERROR "${d} is not defined") + endif() + if(EXPECTED_WORKING_DIR STREQUAL "${${d}}") +message(STATUS "${d} is the
[Cmake-commits] CMake branch, next, updated. v3.3.2-1479-ga5971e8
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 a5971e8b348e48ff5bbb489992d41905f6aa5d65 (commit) via fab35c95cbf47e583cbf86b1db1ac3e77ce7035e (commit) from 6e49b3c19d945d5a0822e3a8457451593b8b9369 (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=a5971e8b348e48ff5bbb489992d41905f6aa5d65 commit a5971e8b348e48ff5bbb489992d41905f6aa5d65 Merge: 6e49b3c fab35c9 Author: Brad KingAuthorDate: Tue Oct 6 10:14:01 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:14:01 2015 -0400 Merge topic 'release-cygwin-subdir' into next fab35c95 Utilities/Release: Move cygwin packages to a subdirectory https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fab35c95cbf47e583cbf86b1db1ac3e77ce7035e commit fab35c95cbf47e583cbf86b1db1ac3e77ce7035e Author: Brad King AuthorDate: Tue Oct 6 10:13:28 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 10:13:28 2015 -0400 Utilities/Release: Move cygwin packages to a subdirectory diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake index c0cd761..ca590ed 100644 --- a/Utilities/Release/dash2win64_cygwin.cmake +++ b/Utilities/Release/dash2win64_cygwin.cmake @@ -28,4 +28,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) # allows us to produce cygwin builds in the short term. set(EXTRA_CTEST_ARGS "-E ExternalProject") +set(LOCAL_DIR cygwin) + include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index 4c4dd8a..c50602d 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -119,27 +119,34 @@ foreach(gen ${generators}) set(SUFFIXES ${SUFFIXES} "*.exe") endif() endforeach() + +if(LOCAL_DIR) + file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${LOCAL_DIR}") +else() + set(LOCAL_DIR .) +endif() + # copy all the files over from the remote machine set(PROJECT_PREFIX cmake-) foreach(suffix ${SUFFIXES}) - message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .") + message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}") execute_process(COMMAND -scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} . +scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR} RESULT_VARIABLE result) if(${result} GREATER 0) -message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .") +message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} ${LOCAL_DIR}") endif() endforeach() # if there are extra files to copy get them as well if(extra_files) foreach(f ${extra_files}) -message("scp ${HOST}:${FINAL_PATH}/${f} .") +message("scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}") execute_process(COMMAND - scp ${HOST}:${FINAL_PATH}/${f} . + scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR} RESULT_VARIABLE result) if(${result} GREATER 0) - message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} .") + message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} ${LOCAL_DIR}") endif() endforeach() endif() --- Summary of changes: Utilities/Release/dash2win64_cygwin.cmake |2 ++ Utilities/Release/release_cmake.cmake | 19 +-- 2 files changed, 15 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[cmake-developers] [Review request] TopicFind GTK2_sigc++_c++11
Hello, Starting with some recent update on my system that updated sigc++ from 2.4.0 to 2.6.1, I noticed that a few GTK2Targets tests depending on sigc++ are failing. According to the sigc++ changelog, starting with version 2.5.1, sigc++ requires c++11 enabled, hence this patch. FindGTK2: Enable c++11 for sigc++ 2.5.1 or later https://cmake.org/gitweb?p=stage/cmake.git;a=commitdiff;h=f06bd1e Can you please review it? Cheers, Daniele -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] automatically download library
Hey, so i've been working on a quite large build system for OpenCMISS, which in turn consumes about 30 external packages itself. the main repo (and cmake logic) can be found here: https://github.com/OpenCMISS/manage (branch v1.0). feel free to have a look around and use some of the logic. essentially, it performs checks using find_package and then downloads the components from our github repos & builds them if not found. however, such an integration with many many components, difficult interoperability and (thus far) unclear origin of the packages that should be automatically installed (you'll need some sort of database / list for that) is quite a thing for a masters thesis. not to speak of incompatibilities with other system libraries that those automatically downloaded packages might want to use. as for ideas, there's the maven concept: https://maven.apache.org/. it's not cmake, but it also deals with the "is package there, if not, i know where to get & build it" issue. good luck :-) Dr. Daniel Wirtz Dipl. Math. Dipl. Inf. SRC SimTech Pfaffenwaldring 5a +49 711 685 60044 On 10/06/2015 02:22 PM, Марсель Галимуллин wrote: Hello! I'm student of the University LETI and as a masrer'sthesis I want to developan extension to CMake. It is expected that this extension will automatically download missinglibrary ifinstruction such as «find_package (Boost COMPONENTS system thread REQUIRED)» can not find the package. Could you give me some advices where to begin and which the best direction to design, developand whether to do it? -- Kind regards, Marsel Galimullin. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [CMake] Removing duplicate entries from CXXFLAGS
Hi Roman, I'm not necessarily only talking about CMAKE_CXX_FLAGS here. I define compile flags for my targets in a number of different ways. Like: find_package( ROOT COMPONENTS ${ROOT_LINK_COMPONENTS} REQUIRED ) include( ${ROOT_USE_FILE} ) ... add_definitions( ${ATLAS_DEFINITIONS} ) ... add_definitions( -Wno-unused-local-typedefs ) if( APPLE ) add_definitions( -Wno-tautological-undefined-compare ) add_definitions( -Wno-inconsistent-missing-override ) endif() ... include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_INCLUDE_OUTPUT_DIRECTORY} ) if( ARG_INCLUDE_DIRS ) target_include_directories( ${libName} PUBLIC ${ARG_INCLUDE_DIRS} ) endif() The trickiest are the definitions that I pull in from external packages. For instance the second line in this example produces a *lot* of duplicate entries in the compilation flags. In this particular case the flags *are* defined like the following in the file that I include with ${ROOT_USE_FILE}: add_definitions(${ROOT_DEFINITIONS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}") Now, CMake definitely doesn't remove the duplicates that enter in all these ways. So now I was wondering what I could do to improve on the situation... Cheers, Attila > On 06 Oct 2015, at 12:58, Roman Bolshakovwrote: > > CMake performs deduplication of per-target flags for sure. > > However I'm not sure if CMAKE_CXX_FLAGS is deduplicated. But I consider this > variable as global flags for the whole project which is defined at topmost > CMakeLists.txt. If you need to specify some flags specifically for a target > use target_compile_options. > > — > Sent from Mailbox > > > On Mon, Oct 5, 2015 at 4:23 PM, Attila Krasznahorkay > wrote: > > Dear All, > > Let me try a simpler question this time. (I'm a bit disappointed that nobody > had any comments on my question about sub-projects.) > > I'm trying to clean up my project's build a bit. As it collects compilation > flags from a few separate places, by the time it finishes collecting > everything, the compilation commands are usually very long. As they have many > duplications. Like: > > -m64 -pipe -W > -Wall -Woverloaded-virtual -fsigned-char -fno-common -Qunused-arguments > -pthread -std=c++11 -Wno-deprecated-declaration > s -stdlib=libc++ -m64 -pipe -W -Wall -Woverloaded-virtual -fsigned-char > -fno-common -Qunused-arguments -pthread -std=c++ > 11 -Wno-deprecated-declarations -stdlib=libc++ -Wno-unused-local-typedefs > -Wno-tautological-undefined-compare -Wno-incon > sistent-missing-override -m64 -pipe -W -Wall -Woverloaded-virtual > -fsigned-char -fno-common -Qunused-arguments -pthread > -std=c++11 -Wno-deprecated-declarations -stdlib=libc++ -m64 -pipe -W -Wall > -Woverloaded-virtual -fsigned-char -fno-commo > n -Qunused-arguments -pthread -std=c++11 -Wno-deprecated-declarations > -stdlib=libc++ -m64 -pipe -W -Wall -Woverloaded-vi > rtual -fsigned-char -fno-common -Qunused-arguments -pthread -std=c++11 > -Wno-deprecated-declarations -stdlib=libc++ -m64 > -pipe -W -Wall -Woverloaded-virtual -fsigned-char -fno-common > -Qunused-arguments -pthread -std=c++11 -Wno-deprecated-dec > larations -stdlib=libc++ -m64 -pipe -fsigned-char -fno-common > -Qunused-arguments -pthread -std=c++11 -stdlib=libc++ > > Naturally it would help the build log reading tremendously if I could remove > the duplications from these lines. But I can't find a good way of doing it. > How could I weed out all the duplications in the CXXFLAGS associated to a > given target? > > Cheers, > Attila > -- > > Powered by www.kitware.com > > Please keep messages on-topic and check the CMake FAQ at: > http://www.cmake.org/Wiki/CMake_FAQ > > Kitware offers various services to support the CMake community. For more > information on each offering, please visit: > > CMake Support: http://cmake.org/cmake/help/support.html > CMake Consulting: http://cmake.org/cmake/help/consulting.html > CMake Training Courses: http://cmake.org/cmake/help/training.html > > Visit other Kitware open-source projects at > http://www.kitware.com/opensource/opensource.html > > Follow this link to subscribe/unsubscribe: > http://public.kitware.com/mailman/listinfo/cmake > > -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [cmake-developers] script mode current directory
On 10/05/2015 04:36 PM, Tamás Kenéz wrote: > Here is the patch which documents and tests those 4 variables Great, thanks. Applied with minor tweaks: Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bb908b1 -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Issue on CMAKE_OSX_SYSROOT
Thanks Brad for the answer. Maybe I did not understand correctly your answers. I’ll use as an example two use cases (which by the way are where we detected the issue) - Compilation of the project. I want the user to be able to compile the project on its machine (so build system = deployment system). Of course I can document that he has to explicitly pass the variable to cmake, but it does not seem too user friendly to me - Brew formula. I have to use ruby to detect the user platform and configure the arguments to cmake accordingly. I also want to add that this issue arose with Xcode 7. Indeed Apple ships now (first the first time) only the 10.11 SDK, even if the system is 10.10. And this is what is causing the issue, because cmake automatically set the deployment target to match the sdk and not the build system. The compiled applications are not executable by the system then. Hope I clarified :) Ciao Francesco > On 05 Oct 2015, at 17:27, Brad Kingwrote: > > On 10/03/2015 05:00 AM, Francesco Romano wrote: >> I don't know if this is the right mailing list > > This is a good place since it concerns a new OS X release. > >> I needed to set the variable `CMAKE_OSX_DEPLOYMENT_TARGET` to 10.10 and this >> was done after the first "project" call. > > That should be right, though I cannot say for sure without seeing the code. > Typically we do not have the project code set this value but instead add > it to the CMake command line when building for deployment: > > -DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 > >> elseif("${CMAKE_GENERATOR}" MATCHES Xcode >> OR CMAKE_OSX_DEPLOYMENT_TARGET >> OR CMAKE_OSX_ARCHITECTURES MATCHES "[^;]" >> OR NOT EXISTS "/usr/include/sys/types.h") >> >> Now, the question is: why the Unix Makefile should not need the >> variable "CMAKE_OSX_SYSROOT" but only if the deployment target is not set? >> Shouldn't be correct to set anyway the sysroot (which by the way can be >> easily found because Xcode is present on the machine)? > > The Unix Makefiles generator also supports the Xcode command-line tools, > third-party compilers, etc. that all build for the host system. If you > are explicitly building for deployment then you should specify > > -DCMAKE_OSX_SYSROOT=/path/to/10.10/SDK > > The Xcode generator searches for a sysroot even when not using an > explicit deployment target because Xcode always wants one specified > and does not support the pure command-line tools. > > -Brad > -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[CMake] How to check if test exists
Hi, What is the best way to check if a test is already defined using function add_test? My initial though was that if() can be used for that purpose but, unfortunately, if (TEST ) is not supported for now. Thanks. Marc -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [cmake-developers] automatically download library
On 10/06/2015 08:22 AM, Марсель Галимуллин wrote: > automatically download missing library if instruction such as > find_package (Boost COMPONENTS system thread REQUIRED) can not > find the package. In general this is outside the scope of a build system and falls in the domain of package management. I do not think this approach is a good fit for CMake's find_package infrastructure as proposed. FYI, CMake already has some features to help people build projects without manually installing all dependencies ahead of time. See ExternalProject and superbuilds for example: http://www.kitware.com/media/html/BuildingExternalProjectsWithCMake2.8.html -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] Add more options for NSIS installer artwork
On 10/05/2015 06:59 PM, Colin Tracey wrote: > I sent a similar patch as plain text in an email to the list last > Friday, but after observing the email traffic It looks like you > prefer attachments. I also added documentation to this one. Inline patches are fine and slightly preferred for me personally because it is easier to quote hunks while commenting. I simply hadn't caught up with all list traffic yet. Anyway, the change looks good and I've applied it with minor tweaks: CPackNSIS: Add options to set the bitmap for NSIS installer left side https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3758af12 Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[CMake] Multiple Executables for every target in Xcode
hello list, I am running Xcode (5 & 6) and using CMake to generate the Xcode project files. We have a lot of targets for our project and we were looking into ways of refactoring the Cmake codes in order to reduce the number of targets. For example we have a lot of plugins that we compile and each plugin is its own "project()" command. One of the things that we have noticed is that just about every "add_executable()" command results in 2 executable targets in the generated Xcode project. I was just wondering if anyone has seen anything like this. We are using CMake 3.3.1 on OS X (10.8/10.9/10.10). Thanks Mike Jackson -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.3.2-1477-g6e49b3c
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 6e49b3c19d945d5a0822e3a8457451593b8b9369 (commit) via f3a5e6f689b17b02ff433d7c313f508874b93c0f (commit) from 93d9a39bcf9942e5763a2c67c2f100053c057eb8 (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=6e49b3c19d945d5a0822e3a8457451593b8b9369 commit 6e49b3c19d945d5a0822e3a8457451593b8b9369 Merge: 93d9a39 f3a5e6f Author: Brad KingAuthorDate: Tue Oct 6 09:45:44 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 09:45:44 2015 -0400 Merge topic 'refactor-qt-autogen' into next f3a5e6f6 fixup! QtAutogen: Port API to cmGeneratorTarget. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3a5e6f689b17b02ff433d7c313f508874b93c0f commit f3a5e6f689b17b02ff433d7c313f508874b93c0f Author: Brad King AuthorDate: Tue Oct 6 09:44:18 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 09:44:18 2015 -0400 fixup! QtAutogen: Port API to cmGeneratorTarget. diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index c03b5c8..2703f4c 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -105,10 +105,11 @@ static void SetupSourceFiles(cmGeneratorTarget const* target, } } -static void GetCompileDefinitionsAndDirectories(cmGeneratorTarget const* target, -const std::string& config, -std::string , -std::string ) +static void GetCompileDefinitionsAndDirectories( + cmGeneratorTarget const* target, + const std::string& config, + std::string , + std::string ) { std::vector includeDirs; cmLocalGenerator *localGen = target->GetLocalGenerator(); --- Summary of changes: Source/cmQtAutoGeneratorInitializer.cxx |9 + 1 file changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[CMake] FindPNG can not find files to set PNG_PNG_INCLUDE_DIR, PNG_LIBRARY
I have libpng16.dll, libpng16.lib, and png.h Where should I put these files to cmake:FindPNG foud them? -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [cmake-developers] [Review request] TopicFind GTK2_sigc++_c++11
On 10/06/2015 12:20 PM, Daniele E. Domenichelli wrote: > I updated the topic according to your comments. The new commit is this: > > FindGTK2: Enable c++11 for sigc++ 2.5.1 or later > https://cmake.org/gitweb?p=stage/cmake.git;a=commitdiff;h=33eb8fa LGTM. > I'm not 100% sure that there aren't other c++11 features used Future versions could add more anyway. This list should be sufficient to get C++11 enabled. Thanks, -Brad -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-83-g5636a89
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 5636a8971908bd663f148081401cf48725bcf71c (commit) via 1bf66fed674bc1b7c463bd230f7c66df8aa86e79 (commit) via 6b575dec8d393c4a38c587ee97afa068eeb4b432 (commit) from 5f80b1b146e2f39b8998cb49ff734e2fc5bcac91 (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=5636a8971908bd663f148081401cf48725bcf71c commit 5636a8971908bd663f148081401cf48725bcf71c Merge: 5f80b1b 1bf66fe Author: Brad KingAuthorDate: Tue Oct 6 11:58:19 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 11:58:19 2015 -0400 Merge topic 'FindOpenSSL-mingw' into next 1bf66fed FindOpenSSL: Search for unix-named libraries first on MinGW (#15765) 6b575dec FindOpenSSL: Tolerate tabs in header while parsing version (#15765) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bf66fed674bc1b7c463bd230f7c66df8aa86e79 commit 1bf66fed674bc1b7c463bd230f7c66df8aa86e79 Author: Wayne Stambaugh AuthorDate: Sat Oct 3 11:40:00 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 11:55:46 2015 -0400 FindOpenSSL: Search for unix-named libraries first on MinGW (#15765) Generalize the change made by commit v2.8.10~228^2~4 (FindOpenSSL: find cross-compiled OpenSSL from MinGW, 2012-07-23) to be used on builds hosted on Windows too. When building for MinGW, consider library names that come with MinGW before looking for the main Windows distribution of OpenSSL. diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 3aea695..8b4b988 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -200,12 +200,8 @@ if(WIN32 AND NOT CYGWIN) set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} ) elseif(MINGW) # same player, for MinGW -set(LIB_EAY_NAMES libeay32) -set(SSL_EAY_NAMES ssleay32) -if(CMAKE_CROSSCOMPILING) - list(APPEND LIB_EAY_NAMES crypto) - list(APPEND SSL_EAY_NAMES ssl) -endif() +set(LIB_EAY_NAMES crypto libeay32) +set(SSL_EAY_NAMES ssl ssleay32) find_library(LIB_EAY NAMES ${LIB_EAY_NAMES} https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b575dec8d393c4a38c587ee97afa068eeb4b432 commit 6b575dec8d393c4a38c587ee97afa068eeb4b432 Author: Wayne Stambaugh AuthorDate: Sat Oct 3 11:40:00 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 11:50:32 2015 -0400 FindOpenSSL: Tolerate tabs in header while parsing version (#15765) Tolerate tabs instead of spaces in the "# define" line. diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index a0f4c52..3aea695 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -325,7 +325,7 @@ endfunction() if (OPENSSL_INCLUDE_DIR) if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str - REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") # The version number is encoded as 0xMNNFFPPS: major minor fix patch status # The status gives if this is a developer or prerelease and is ignored here. --- Summary of changes: Modules/FindOpenSSL.cmake | 10 +++--- 1 file changed, 3 insertions(+), 7 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, master, updated. v3.3.2-1439-gc914d2b
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 c914d2bda278b588c1dca3e0fa5ec97a64c56c3c (commit) via 616f03114eb41218dc3278e72b52d8de09e40365 (commit) via 9eea0486bfe5dfd497e6a8fca9e3c2551169c24e (commit) via 2eca0559881c36061f84ea4fcd955ac32d9d427a (commit) via 21f428f4c0adf7045e852be30739cd1243aa96fe (commit) via a9588e90bbddbfe71b1d33d63d38eedaf397023f (commit) via 4407eee01365d89d370d8e8b89f3ec0a65420046 (commit) via a09c545d3a518d771b66b59f92821af3d55d7d4b (commit) from 9d5bfa53e63c894b1c774258882877f57d61638f (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=c914d2bda278b588c1dca3e0fa5ec97a64c56c3c commit c914d2bda278b588c1dca3e0fa5ec97a64c56c3c Merge: 9d5bfa5 616f031 Author: Brad KingAuthorDate: Tue Oct 6 10:59:00 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:59:00 2015 -0400 Merge topic 'refactor-computation' 616f0311 cmGlobalGenerator: Move path computation to Compute. 9eea0486 cmGlobalGenerator: Do more computation at compute time. 2eca0559 cmGlobalGenerator: De-virtualize Compute(). 21f428f4 VisualStudio: Replace Compute override with AddExtraIDETargets override. a9588e90 VisualStudio10: Initialize the LongestSource at generate time. 4407eee0 cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute(). a09c545d Xcode: Extract a AddExtraIDETargets method. --- Summary of changes: Source/cmGlobalGenerator.cxx | 26 +- Source/cmGlobalGenerator.h |3 ++- Source/cmGlobalVisualStudio10Generator.cxx | 12 +--- Source/cmGlobalVisualStudio10Generator.h |2 -- Source/cmGlobalVisualStudio8Generator.cxx |9 ++--- Source/cmGlobalVisualStudio8Generator.h|2 +- Source/cmGlobalVisualStudioGenerator.cxx |8 +--- Source/cmGlobalVisualStudioGenerator.h |2 +- Source/cmGlobalXCodeGenerator.cxx |9 + Source/cmGlobalXCodeGenerator.h|2 +- 10 files changed, 23 insertions(+), 52 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, master, updated. v3.3.2-1431-g9d5bfa5
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 9d5bfa53e63c894b1c774258882877f57d61638f (commit) via 15c02cf14edd823b96660e65772a9db568a25bdc (commit) via f7738fd122ac38fb3785e6366193fe5095b23b88 (commit) via b2054e1661e5c607cf25e1ac127982f58e29dd44 (commit) via 1e757c318b38566aea1c9312a6fb5a3accd3966b (commit) via 5fb730174dc5e0c07dfc7aec27e3d6e60c79e3d3 (commit) via 86f7fc5d55da5cf569c516f2d1fb8b69603c1be2 (commit) via 2aa3f500c49e6c81f4d4b821d6ae71ef2589cb07 (commit) via 59b91107d16c2f2ba68791ae67c53bdcc0d32e05 (commit) via 7254f6452596f438f0607ece559be7ad556b190a (commit) via 975b753997849507684da7d529d1bbe0ffd3ade9 (commit) via f75ec6044c593d0ff042e13b940d2c674910b683 (commit) via f3158e45b8fde882603e1d9b2262a5c64e25c1ee (commit) via 493b17f8c7fb171fd7ca36cc0b29257939609298 (commit) from 3709e950f4ed7545a38c2506c19ee90ee58fa920 (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=9d5bfa53e63c894b1c774258882877f57d61638f commit 9d5bfa53e63c894b1c774258882877f57d61638f Merge: 3709e95 15c02cf Author: Brad KingAuthorDate: Tue Oct 6 10:58:58 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:58:58 2015 -0400 Merge topic 'refactor-qt-autogen' 15c02cf1 QtAutogen: Port API to cmGeneratorTarget. f7738fd1 cmLocalGenerator: Constify target in API. b2054e16 QtAutogen: Port global generator to cmGeneratorTarget. 1e757c31 QtAutogen: Use a target type between loops. 5fb73017 QtAutogen: Make some private statics file static. 86f7fc5d QtAutogen: Move SetupAutoRccTarget method. 2aa3f500 QtAutogen: Move MergeRccOptions method. 59b91107 QtAutogen: Move GetRccExecutable method. 7254f645 QtAutogen: Move SetupAutoUicTarget method. 975b7539 QtAutogen: Move GetUicOpts method. f75ec604 QtAutogen: Move SetupAutoMocTarget method. f3158e45 QtAutogen: Move GetCompileDefinitionsAndDirectories method. 493b17f8 QtAutogen: Move SetupSourceFiles method. --- Summary of changes: Source/cmGlobalGenerator.cxx| 30 +- Source/cmGlobalGenerator.h |2 +- Source/cmLocalGenerator.cxx |2 +- Source/cmLocalGenerator.h |2 +- Source/cmQtAutoGeneratorInitializer.cxx | 1692 +++ Source/cmQtAutoGeneratorInitializer.h | 41 +- 6 files changed, 854 insertions(+), 915 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.3.2-1493-g5f80b1b
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 5f80b1b146e2f39b8998cb49ff734e2fc5bcac91 (commit) via 256bf8876a2e460afc37dbe17eb34482944be20b (commit) via 5d315f32236dfebf3561789d17b2d86c504d (commit) via 53d90de3d9b536bcee45acc40183569895a9776e (commit) via c914d2bda278b588c1dca3e0fa5ec97a64c56c3c (commit) via 9d5bfa53e63c894b1c774258882877f57d61638f (commit) from a868359d4b10a917c30174613c1aeb6bdf5d6fdf (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=5f80b1b146e2f39b8998cb49ff734e2fc5bcac91 commit 5f80b1b146e2f39b8998cb49ff734e2fc5bcac91 Merge: a868359 256bf88 Author: Brad KingAuthorDate: Tue Oct 6 10:59:27 2015 -0400 Commit: Brad King CommitDate: Tue Oct 6 10:59:27 2015 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.2-1446-g53d90de
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 53d90de3d9b536bcee45acc40183569895a9776e (commit) via 74d565e0e91f31e5fb25c74f998a2e4553c0842e (commit) via 09466690f05a2d81383409962cda2213fd366d8c (commit) via 0a73044579a687d1f610a3b6d65e801d2f217435 (commit) via 3339a7508e2d90cbc832490e64f593c1ab935097 (commit) via 6da4cd8fb9a2583c7ba08c403ec3a5aeb264730f (commit) via 94cc4e74aec3bc76e94a426d94cd1015c8a9749e (commit) from c914d2bda278b588c1dca3e0fa5ec97a64c56c3c (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=53d90de3d9b536bcee45acc40183569895a9776e commit 53d90de3d9b536bcee45acc40183569895a9776e Merge: c914d2b 74d565e Author: Brad KingAuthorDate: Tue Oct 6 10:59:06 2015 -0400 Commit: CMake Topic Stage CommitDate: Tue Oct 6 10:59:06 2015 -0400 Merge topic 'clean-up-cmLocalGenerator' 74d565e0 Remove unused cmLocalGenerator include. 09466690 Add cmOutputConverter include where needed. 0a730445 cmake: Remove needless cmLocalGenerator creation. 3339a750 CTest: Port away from cmLocalGenerator. 6da4cd8f CTest: Remove needless cmLocalGenerator creation. 94cc4e74 CPack: Remove needless cmLocalGenerator creation. --- Summary of changes: Source/CPack/IFW/cmCPackIFWGenerator.cxx |1 - Source/CPack/cmCPackArchiveGenerator.cxx |1 - Source/CPack/cmCPackCygwinBinaryGenerator.cxx |1 - Source/CPack/cmCPackCygwinSourceGenerator.cxx |1 - Source/CPack/cmCPackGenerator.cxx |3 --- Source/CPack/cmCPackNSISGenerator.cxx |1 - Source/CPack/cmCPackOSXX11Generator.cxx |1 - Source/CPack/cmCPackPackageMakerGenerator.cxx |1 - Source/CPack/cmCPackSTGZGenerator.cxx |1 - Source/CPack/cpack.cxx|3 --- Source/CTest/cmCTestBuildHandler.cxx |1 - Source/CTest/cmCTestLaunch.cxx|3 --- Source/CTest/cmCTestScriptHandler.cxx | 14 ++ Source/CTest/cmCTestScriptHandler.h |2 -- Source/CTest/cmCTestStartCommand.cxx |1 - Source/CTest/cmCTestTestHandler.cxx |3 --- Source/CTest/cmCTestUpdateHandler.cxx |1 - Source/cmAddDependenciesCommand.cxx |1 - Source/cmBuildCommand.cxx |1 - Source/cmCTest.cxx|2 -- Source/cmEnableTestingCommand.cxx |1 - Source/cmExportCommand.cxx|1 - Source/cmFileCommand.cxx |1 - Source/cmGetCMakePropertyCommand.cxx |1 - Source/cmGetPropertyCommand.cxx |1 - Source/cmIfCommand.cxx|1 + Source/cmListFileCache.cxx|2 +- Source/cmSetTargetPropertiesCommand.cxx |1 - Source/cmSourceFile.cxx |1 - Source/cmSourceFileLocation.cxx |1 - Source/cmake.cxx | 12 +--- 31 files changed, 9 insertions(+), 57 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits