[Cmake-commits] CMake branch, master, updated. v3.4.1-615-g7410e2e
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 7410e2ed61851385d0c06dd174a4782a54c44ab0 (commit) from 4ffeab0e3c451854a4a9d424b47b2179c6cf6c6b (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=7410e2ed61851385d0c06dd174a4782a54c44ab0 commit 7410e2ed61851385d0c06dd174a4782a54c44ab0 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Fri Dec 4 00:01:09 2015 -0500 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Fri Dec 4 00:01:09 2015 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 141015d..81d33c2 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 20151203) +set(CMake_VERSION_PATCH 20151204) #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.1-1572-g4d1d9c6
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 4d1d9c62c5bb26fdf202e6fa5f302bee254ab77c (commit) via 56c11eee13604e163eb5a5d9092df405be0e9a5c (commit) from d8ac93fff8a91c77294d2c5b062765ebdafdbe1e (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=4d1d9c62c5bb26fdf202e6fa5f302bee254ab77c commit 4d1d9c62c5bb26fdf202e6fa5f302bee254ab77c Merge: d8ac93f 56c11ee Author: Brad KingAuthorDate: Thu Dec 3 09:24:54 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 09:24:54 2015 -0500 Merge topic 'UseJava-relative-manifest' into next 56c11eee UseJava: Allow relative path to manifest file just as with other sources https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56c11eee13604e163eb5a5d9092df405be0e9a5c commit 56c11eee13604e163eb5a5d9092df405be0e9a5c Author: Marc Chevrier AuthorDate: Thu Dec 3 12:35:37 2015 +0100 Commit: Brad King CommitDate: Thu Dec 3 09:24:26 2015 -0500 UseJava: Allow relative path to manifest file just as with other sources diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake index dced6ec..6146d78 100644 --- a/Modules/UseJava.cmake +++ b/Modules/UseJava.cmake @@ -444,7 +444,7 @@ function(add_jar _TARGET_NAME) if (_add_jar_MANIFEST) set(_MANIFEST_OPTION m) -set(_MANIFEST_VALUE ${_add_jar_MANIFEST}) +get_filename_component (_MANIFEST_VALUE "${_add_jar_MANIFEST}" ABSOLUTE) endif () if (LIBRARY_OUTPUT_PATH) --- Summary of changes: Modules/UseJava.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.1-1566-gb0cc082
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 b0cc082ad6c6619653afbceca0ac2888d944e9e2 (commit) via e76ee2c006777e268715b39ad71f49e3d18b11a4 (commit) from 1c27e7df4e033f981dde15f7731913ffd6750b03 (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=b0cc082ad6c6619653afbceca0ac2888d944e9e2 commit b0cc082ad6c6619653afbceca0ac2888d944e9e2 Merge: 1c27e7d e76ee2c Author: Brad KingAuthorDate: Thu Dec 3 09:06:59 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 09:06:59 2015 -0500 Merge topic 'ios-framework-resource-layout' into next e76ee2c0 iOS: Fix framework resource directory layout (#15848) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e76ee2c006777e268715b39ad71f49e3d18b11a4 commit e76ee2c006777e268715b39ad71f49e3d18b11a4 Author: Bartosz Kosiorek AuthorDate: Wed Dec 2 22:34:25 2015 +0100 Commit: Brad King CommitDate: Thu Dec 3 08:52:09 2015 -0500 iOS: Fix framework resource directory layout (#15848) A typical iOS application bundle (also Framework Bundle) contains the application executable and any resources used by the application (for instance, the application icon, other images, and localized content) in the top-level bundle directory. The same rule applies to Framework Bundles. diff --git a/Help/prop_tgt/MACOSX_BUNDLE.rst b/Help/prop_tgt/MACOSX_BUNDLE.rst index 8d7d914..7cd8046 100644 --- a/Help/prop_tgt/MACOSX_BUNDLE.rst +++ b/Help/prop_tgt/MACOSX_BUNDLE.rst @@ -3,7 +3,7 @@ MACOSX_BUNDLE Build an executable as an Application Bundle on OS X or iOS. -When this property is set to true the executable when built on OS X +When this property is set to ``TRUE`` the executable when built on OS X or iOS will be created as an application bundle. This makes it a GUI executable that can be launched from the Finder. See the :prop_tgt:`MACOSX_FRAMEWORK_INFO_PLIST` target property for information about diff --git a/Help/prop_tgt/MACOSX_RPATH.rst b/Help/prop_tgt/MACOSX_RPATH.rst index 41bb8cc..1f9a036 100644 --- a/Help/prop_tgt/MACOSX_RPATH.rst +++ b/Help/prop_tgt/MACOSX_RPATH.rst @@ -3,8 +3,8 @@ MACOSX_RPATH Whether this target on OS X or iOS is located at runtime using rpaths. -When this property is set to true, the directory portion of -the "install_name" field of this shared library will be ``@rpath`` +When this property is set to ``TRUE``, the directory portion of +the ``install_name`` field of this shared library will be ``@rpath`` unless overridden by :prop_tgt:`INSTALL_NAME_DIR`. This indicates the shared library is to be found at runtime using runtime paths (rpaths). @@ -18,6 +18,6 @@ can be controlled by the :prop_tgt:`INSTALL_RPATH` target property on the target linking to this target. Policy :policy:`CMP0042` was introduced to change the default value of -``MACOSX_RPATH`` to ``TRUE. This is because use of ``@rpath`` is a +``MACOSX_RPATH`` to ``TRUE``. This is because use of ``@rpath`` is a more flexible and powerful alternative to ``@executable_path`` and ``@loader_path``. diff --git a/Help/prop_tgt/RESOURCE.rst b/Help/prop_tgt/RESOURCE.rst index 5dad3ea..d837f7b 100644 --- a/Help/prop_tgt/RESOURCE.rst +++ b/Help/prop_tgt/RESOURCE.rst @@ -1,11 +1,61 @@ RESOURCE -Specify resource files in a :prop_tgt:`FRAMEWORK` shared library target. - -Shared library targets marked with the :prop_tgt:`FRAMEWORK` property generate -frameworks on OS X, iOS and normal shared libraries on other platforms. -This property may be set to a list of files to be placed in the -``Resources`` directory inside the framework folder. On non-Apple -platforms these files may be installed using the ``RESOURCE`` option to -the ``install(TARGETS)`` command. +Specify resource files in a :prop_tgt:`FRAMEWORK` or :prop_tgt:`BUNDLE`. + +Target marked with the :prop_tgt:`FRAMEWORK` or :prop_tgt:`BUNDLE` property +generate framework or application bundle (both OS X and iOS is supported) +or normal shared libraries on other platforms. +This property may be set to a list of files to be placed in the corresponding +directory (eg. ``Resources`` directory for OS X) inside the bundle. +On non-Apple platforms these files may be installed using the ``RESOURCE`` +option to the ``install(TARGETS)`` command. + +Following example of Application Bundle: + +.. code-block:: cmake + + add_executable(ExecutableTarget +addDemo.c +resourcefile.txt +appresourcedir/appres.txt + ) + + target_link_libraries(ExecutableTarget
[Cmake-commits] CMake branch, next, updated. v3.4.1-1568-g103203b
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 103203b3b0b83c73476f82a2e1bd29bb272a53c6 (commit) via d8b251e2ea84e612dc30a1c9690a8b299aeb30fd (commit) from b0cc082ad6c6619653afbceca0ac2888d944e9e2 (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=103203b3b0b83c73476f82a2e1bd29bb272a53c6 commit 103203b3b0b83c73476f82a2e1bd29bb272a53c6 Merge: b0cc082 d8b251e Author: Brad KingAuthorDate: Thu Dec 3 09:17:56 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 09:17:56 2015 -0500 Merge topic 'fix-java-idlj-jarsigner-typos' into next d8b251e2 FindJava: Fix typos in IdlJ and JarSigner component implementation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8b251e2ea84e612dc30a1c9690a8b299aeb30fd commit d8b251e2ea84e612dc30a1c9690a8b299aeb30fd Author: Marc Chevrier AuthorDate: Thu Dec 3 12:34:51 2015 +0100 Commit: Brad King CommitDate: Thu Dec 3 09:17:00 2015 -0500 FindJava: Fix typos in IdlJ and JarSigner component implementation Fix typos introduced by commit v3.4.0-rc1~257^2~2 (FindJava: Add support for idlj and jarsigner tools, 2015-07-31) to correctly report when these components are found. diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 9f87997..cc67df6 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -228,12 +228,12 @@ if(Java_FIND_COMPONENTS) endif() elseif(component STREQUAL "IdlJ") list(APPEND _JAVA_REQUIRED_VARS Java_IDLJ_EXECUTABLE) - if(Java_IdlJ_EXECUTABLE) -set(Java_Extra_FOUND TRUE) + if(Java_IDLJ_EXECUTABLE) +set(Java_IdlJ_FOUND TRUE) endif() elseif(component STREQUAL "JarSigner") list(APPEND _JAVA_REQUIRED_VARS Java_JARSIGNER_EXECUTABLE) - if(Java_IDLJ_EXECUTABLE) + if(Java_JARSIGNER_EXECUTABLE) set(Java_JarSigner_FOUND TRUE) endif() else() --- Summary of changes: Modules/FindJava.cmake |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
[Cmake-commits] CMake branch, next, updated. v3.4.1-1570-gd8ac93f
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 d8ac93fff8a91c77294d2c5b062765ebdafdbe1e (commit) via 6fc91ffb5f836e5878295030ea83a8f733fd0e96 (commit) from 103203b3b0b83c73476f82a2e1bd29bb272a53c6 (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=d8ac93fff8a91c77294d2c5b062765ebdafdbe1e commit d8ac93fff8a91c77294d2c5b062765ebdafdbe1e Merge: 103203b 6fc91ff Author: Brad KingAuthorDate: Thu Dec 3 09:23:08 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 09:23:08 2015 -0500 Merge topic 'FindJNI-aix' into next 6fc91ffb FindJNI: Add support for AIX java sdk https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6fc91ffb5f836e5878295030ea83a8f733fd0e96 commit 6fc91ffb5f836e5878295030ea83a8f733fd0e96 Author: Marc Chevrier AuthorDate: Thu Dec 3 12:37:26 2015 +0100 Commit: Brad King CommitDate: Thu Dec 3 09:20:07 2015 -0500 FindJNI: Add support for AIX java sdk diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index cbe21d7..037764a 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -63,7 +63,7 @@ macro(java_append_library_directories _var) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") set(_java_libarch "ppc64" "ppc") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") -set(_java_libarch "ppc") +set(_java_libarch "ppc" "ppc64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc") # Both flavours can run on the same processor set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9") @@ -271,7 +271,7 @@ find_path(JAVA_INCLUDE_PATH jni.h ${JAVA_AWT_INCLUDE_DIRECTORIES} ) -find_path(JAVA_INCLUDE_PATH2 jni_md.h +find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/darwin ${JAVA_INCLUDE_PATH}/win32 @@ -281,6 +281,7 @@ find_path(JAVA_INCLUDE_PATH2 jni_md.h ${JAVA_INCLUDE_PATH}/solaris ${JAVA_INCLUDE_PATH}/hp-ux ${JAVA_INCLUDE_PATH}/alpha + ${JAVA_INCLUDE_PATH}/aix ) find_path(JAVA_AWT_INCLUDE_PATH jawt.h --- Summary of changes: Modules/FindJNI.cmake |5 +++-- 1 file 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
[Cmake-commits] CMake branch, next, updated. v3.4.1-1576-g97739fa
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 97739fa35a165782eba503845a14f3eb769b0338 (commit) via 8003ff4f85df29213becc0ac3d45ffa8b592bf75 (commit) from eb9afec9bd9949e4a7fd26b95bf1b9a0eafcfe1e (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=97739fa35a165782eba503845a14f3eb769b0338 commit 97739fa35a165782eba503845a14f3eb769b0338 Merge: eb9afec 8003ff4 Author: Chuck AtkinsAuthorDate: Thu Dec 3 10:25:46 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 10:25:46 2015 -0500 Merge topic 'detect-compiler-wrappers' into next 8003ff4f Compiler: Add infrastructure for detecting compiler wrappers https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8003ff4f85df29213becc0ac3d45ffa8b592bf75 commit 8003ff4f85df29213becc0ac3d45ffa8b592bf75 Author: Chuck Atkins AuthorDate: Wed Dec 2 08:47:43 2015 -0600 Commit: Chuck Atkins CommitDate: Thu Dec 3 10:25:29 2015 -0500 Compiler: Add infrastructure for detecting compiler wrappers diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in index c72e338..f109a14 100644 --- a/Modules/CMakeCCompiler.cmake.in +++ b/Modules/CMakeCCompiler.cmake.in @@ -2,6 +2,7 @@ set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@") set(CMAKE_C_COMPILER_ARG1 "@CMAKE_C_COMPILER_ARG1@") set(CMAKE_C_COMPILER_ID "@CMAKE_C_COMPILER_ID@") set(CMAKE_C_COMPILER_VERSION "@CMAKE_C_COMPILER_VERSION@") +set(CMAKE_C_COMPILER_WRAPPER "@CMAKE_C_COMPILER_WRAPPER@") set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "@CMAKE_C_STANDARD_COMPUTED_DEFAULT@") set(CMAKE_C_COMPILE_FEATURES "@CMAKE_C_COMPILE_FEATURES@") set(CMAKE_C90_COMPILE_FEATURES "@CMAKE_C90_COMPILE_FEATURES@") diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake index d2417aa..5c3705c 100644 --- a/Modules/CMakeCInformation.cmake +++ b/Modules/CMakeCInformation.cmake @@ -60,6 +60,18 @@ if (NOT _INCLUDED_FILE) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) endif () + +# load any compiler-wrapper specific information +if (CMAKE_C_COMPILER_WRAPPER) + set(_INCLUDED_WRAPPER_FILE 0) + if (CMAKE_C_COMPILER_ID) + include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_WRAPPER}-${CMAKE_C_COMPILER_ID}-C OPTIONAL RESULT_VARIABLE _INCLUDED_WRAPPER_FILE) + endif() + if (NOT _INCLUDED_WRAPPER_FILE) +include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_WRAPPER}-C OPTIONAL RESULT_VARIABLE _INCLUDED_WRAPPER_FILE) + endif () +endif () + # We specify the compiler information in the system file for some # platforms, but this language may not have been enabled when the file # was first included. Include it again to get the language info. diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in index 52e44f6..9e90aea 100644 --- a/Modules/CMakeCXXCompiler.cmake.in +++ b/Modules/CMakeCXXCompiler.cmake.in @@ -2,6 +2,7 @@ set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@") set(CMAKE_CXX_COMPILER_ARG1 "@CMAKE_CXX_COMPILER_ARG1@") set(CMAKE_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@") set(CMAKE_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@") +set(CMAKE_CXX_COMPILER_WRAPPER "@CMAKE_CXX_COMPILER_WRAPPER@") set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "@CMAKE_CXX_STANDARD_COMPUTED_DEFAULT@") set(CMAKE_CXX_COMPILE_FEATURES "@CMAKE_CXX_COMPILE_FEATURES@") set(CMAKE_CXX98_COMPILE_FEATURES "@CMAKE_CXX98_COMPILE_FEATURES@") diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake index 091627b..cbcd0df 100644 --- a/Modules/CMakeCXXInformation.cmake +++ b/Modules/CMakeCXXInformation.cmake @@ -59,6 +59,18 @@ if (NOT _INCLUDED_FILE) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) endif () + +# load any compiler-wrapper specific information +if (CMAKE_CXX_COMPILER_WRAPPER) + set(_INCLUDED_WRAPPER_FILE 0) + if (CMAKE_CXX_COMPILER_ID) + include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_WRAPPER}-${CMAKE_CXX_COMPILER_ID}-CXX OPTIONAL RESULT_VARIABLE _INCLUDED_WRAPPER_FILE) + endif() + if (NOT _INCLUDED_WRAPPER_FILE) +include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_WRAPPER}-CXX OPTIONAL RESULT_VARIABLE _INCLUDED_WRAPPER_FILE) + endif () +endif () + # We specify the compiler information in the system file for some # platforms, but this language may not have been enabled when the file # was first included. Include it again to get the language info. diff --git
[Cmake-commits] CMake branch, next, updated. v3.4.1-1574-geb9afec
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 eb9afec9bd9949e4a7fd26b95bf1b9a0eafcfe1e (commit) via 07b0b29d6cb38cec581c126b4e69fc10e8e48d1a (commit) from 4d1d9c62c5bb26fdf202e6fa5f302bee254ab77c (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=eb9afec9bd9949e4a7fd26b95bf1b9a0eafcfe1e commit eb9afec9bd9949e4a7fd26b95bf1b9a0eafcfe1e Merge: 4d1d9c6 07b0b29 Author: Chuck AtkinsAuthorDate: Thu Dec 3 10:25:10 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 10:25:10 2015 -0500 Merge topic 'detect-compiler-wrappers' into next 07b0b29d Wrappers: remove generic case https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07b0b29d6cb38cec581c126b4e69fc10e8e48d1a commit 07b0b29d6cb38cec581c126b4e69fc10e8e48d1a Author: Chuck Atkins AuthorDate: Thu Dec 3 10:24:33 2015 -0500 Commit: Chuck Atkins CommitDate: Thu Dec 3 10:24:33 2015 -0500 Wrappers: remove generic case diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake index c204c77..5c3705c 100644 --- a/Modules/CMakeCInformation.cmake +++ b/Modules/CMakeCInformation.cmake @@ -70,9 +70,6 @@ if (CMAKE_C_COMPILER_WRAPPER) if (NOT _INCLUDED_WRAPPER_FILE) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_WRAPPER}-C OPTIONAL RESULT_VARIABLE _INCLUDED_WRAPPER_FILE) endif () - if (NOT _INCLUDED_WRAPPER_FILE) -include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_WRAPPER} OPTIONAL) - endif () endif () # We specify the compiler information in the system file for some diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake index cd706f4..cbcd0df 100644 --- a/Modules/CMakeCXXInformation.cmake +++ b/Modules/CMakeCXXInformation.cmake @@ -69,9 +69,6 @@ if (CMAKE_CXX_COMPILER_WRAPPER) if (NOT _INCLUDED_WRAPPER_FILE) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_WRAPPER}-CXX OPTIONAL RESULT_VARIABLE _INCLUDED_WRAPPER_FILE) endif () - if (NOT _INCLUDED_WRAPPER_FILE) -include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_WRAPPER} OPTIONAL) - endif () endif () # We specify the compiler information in the system file for some diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake index 110eec2..84ece04 100644 --- a/Modules/CMakeFortranInformation.cmake +++ b/Modules/CMakeFortranInformation.cmake @@ -46,9 +46,6 @@ if (CMAKE_Fortran_COMPILER_WRAPPER) if (NOT _INCLUDED_WRAPPER_FILE) include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_WRAPPER}-Fortran OPTIONAL RESULT_VARIABLE _INCLUDED_WRAPPER_FILE) endif () - if (NOT _INCLUDED_WRAPPER_FILE) -include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_WRAPPER} OPTIONAL) - endif () endif () # We specify the compiler information in the system file for some --- Summary of changes: Modules/CMakeCInformation.cmake |3 --- Modules/CMakeCXXInformation.cmake |3 --- Modules/CMakeFortranInformation.cmake |3 --- 3 files changed, 9 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.1-1578-g23b5ca6
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 23b5ca6d7461f3c166a0ab826c456bc30a370452 (commit) via fc656fa4fe2926c7a50de91ff1b5564802ac4a7e (commit) from 97739fa35a165782eba503845a14f3eb769b0338 (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=23b5ca6d7461f3c166a0ab826c456bc30a370452 commit 23b5ca6d7461f3c166a0ab826c456bc30a370452 Merge: 97739fa fc656fa Author: Gregor JasnyAuthorDate: Thu Dec 3 15:49:54 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 15:49:54 2015 -0500 Merge topic 'regex-explorer' into next fc656fa4 cmake-gui: Add regex explorer window https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc656fa4fe2926c7a50de91ff1b5564802ac4a7e commit fc656fa4fe2926c7a50de91ff1b5564802ac4a7e Author: Gregor Jasny AuthorDate: Wed Nov 18 22:40:59 2015 +0100 Commit: Gregor Jasny CommitDate: Thu Dec 3 21:45:54 2015 +0100 cmake-gui: Add regex explorer window diff --git a/Help/release/dev/regex-explorer.rst b/Help/release/dev/regex-explorer.rst new file mode 100644 index 000..2147816 --- /dev/null +++ b/Help/release/dev/regex-explorer.rst @@ -0,0 +1,6 @@ +regex-explorer +-- + +* The Qt base CMake GUI got a Regular Expression Explorer which could be used to + create and evaluate regular expressions in real-time. The explorer window + is available via the ``Tools`` menu. diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 66fd18b..cad11f5 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -113,12 +113,15 @@ set(SRCS QCMakeCacheView.h QCMakeWidgets.cxx QCMakeWidgets.h + RegexExplorer.cxx + RegexExplorer.h ) QT4_WRAP_UI(UI_SRCS CMakeSetupDialog.ui Compilers.ui CrossCompiler.ui AddCacheEntry.ui + RegexExplorer.ui ) QT4_WRAP_CPP(MOC_SRCS AddCacheEntry.h @@ -128,6 +131,7 @@ QT4_WRAP_CPP(MOC_SRCS QCMake.h QCMakeCacheView.h QCMakeWidgets.h + RegexExplorer.h ) QT4_ADD_RESOURCES(RC_SRCS CMakeSetup.qrc) diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 748dd7d..2b12834 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -33,6 +33,7 @@ #include "QCMakeCacheView.h" #include "AddCacheEntry.h" #include "FirstConfigure.h" +#include "RegexExplorer.h" #include "cmSystemTools.h" #include "cmVersion.h" @@ -125,6 +126,9 @@ CMakeSetupDialog::CMakeSetupDialog() this, SLOT(doInstallForCommandLine())); #endif ToolsMenu->addSeparator(); + ToolsMenu->addAction(tr("Regular Expression Explorer..."), + this, SLOT(doRegexExplorerDialog())); + ToolsMenu->addSeparator(); ToolsMenu->addAction(tr(" in Output..."), this, SLOT(doOutputFindDialog()), QKeySequence::Find); @@ -1272,6 +1276,12 @@ void CMakeSetupDialog::doOutputFindDialog() } } +void CMakeSetupDialog::doRegexExplorerDialog() +{ + RegexExplorer dialog(this); + dialog.exec(); +} + void CMakeSetupDialog::doOutputFindPrev() { doOutputFindNext(false); diff --git a/Source/QtDialog/CMakeSetupDialog.h b/Source/QtDialog/CMakeSetupDialog.h index 1b26c64..bfd2bc9 100644 --- a/Source/QtDialog/CMakeSetupDialog.h +++ b/Source/QtDialog/CMakeSetupDialog.h @@ -82,6 +82,7 @@ protected slots: void doOutputFindNext(bool directionForward = true); void doOutputFindPrev(); void doOutputErrorNext(); + void doRegexExplorerDialog(); protected: diff --git a/Source/QtDialog/RegexExplorer.cxx b/Source/QtDialog/RegexExplorer.cxx new file mode 100644 index 000..dfcf048 --- /dev/null +++ b/Source/QtDialog/RegexExplorer.cxx @@ -0,0 +1,166 @@ +/* + CMake - Cross Platform Makefile Generator + Copyright 2015 Kitware, Inc., Gregor Jasny + + Distributed under the OSI-approved BSD License (the "License"); + see accompanying file Copyright.txt for details. + + This software is distributed WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the License for more information. +*/ + +#include "RegexExplorer.h" + +RegexExplorer::RegexExplorer(QWidget* p) : QDialog(p), m_matched(false) +{ + this->setupUi(this); + + for(int i = 1; i < cmsys::RegularExpression::NSUBEXP; ++i) +{ +
[Cmake-commits] CMake branch, next, updated. v3.4.1-1585-g26d765c
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 26d765cf6b6c6a08b03b8643cd7b408dc29a373b (commit) via 7a3277276e69c92d0f69674cdc27bae11bcbc14f (commit) via 25211d756fad353e96d29e289d40d780a5341c92 (commit) via 060442c2e866c44ecf0c479e49e1d5ae35e8c6fb (commit) via f3b3219c9687e54a83dc7e5dabb0afc4637bb799 (commit) via ddbda72288f022fa558d8253c8894687634448c1 (commit) via 4ffeab0e3c451854a4a9d424b47b2179c6cf6c6b (commit) from 23b5ca6d7461f3c166a0ab826c456bc30a370452 (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=26d765cf6b6c6a08b03b8643cd7b408dc29a373b commit 26d765cf6b6c6a08b03b8643cd7b408dc29a373b Merge: 23b5ca6 7a32772 Author: James JohnstonAuthorDate: Thu Dec 3 16:39:47 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 16:39:47 2015 -0500 Merge topic 'improve-embarcadero' into next 7a327727 Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__. 25211d75 Compiler ID: Compiler versions must be a valid, numeric version string. 060442c2 Embarcadero: Check code using CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID. f3b3219c Embarcadero/Watcom: Properly skip VSResource test for other generators. ddbda722 Embarcadero: Fix bug where duplicate Ninja job pools would be created. 4ffeab0e CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a3277276e69c92d0f69674cdc27bae11bcbc14f commit 7a3277276e69c92d0f69674cdc27bae11bcbc14f Author: James Johnston AuthorDate: Thu Dec 3 21:24:56 2015 + Commit: James Johnston CommitDate: Thu Dec 3 21:37:08 2015 + Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__. As per the following link: http://docwiki.embarcadero.com/RADStudio/Seattle/en/Example_of_CODEGEARC_VERSION_Macro The major/minor versions must be decoded as a hex string, while the patch version must be decoded as a normal decimal string. As an example, C++ Builder XE 8.1's bcc32.exe sets this macro to 0x070189C9. The file version of bcc32.exe is 7.1.5570.35273. Therefore, the correct interpretation to COMPILER_VERSION would be 7.1.35273. diff --git a/Modules/Compiler/Embarcadero-DetermineCompiler.cmake b/Modules/Compiler/Embarcadero-DetermineCompiler.cmake index 2feedac..8375624 100644 --- a/Modules/Compiler/Embarcadero-DetermineCompiler.cmake +++ b/Modules/Compiler/Embarcadero-DetermineCompiler.cmake @@ -4,4 +4,4 @@ set(_compiler_id_pp_test "defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__ set(_compiler_id_version_compute " # define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__CODEGEARC_VERSION__>>24 & 0x00FF) # define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__CODEGEARC_VERSION__>>16 & 0x00FF) -# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__CODEGEARC_VERSION__ & 0x)") +# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__CODEGEARC_VERSION__ & 0x)") https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25211d756fad353e96d29e289d40d780a5341c92 commit 25211d756fad353e96d29e289d40d780a5341c92 Author: James Johnston AuthorDate: Thu Dec 3 21:17:26 2015 + Commit: James Johnston CommitDate: Thu Dec 3 21:37:07 2015 + Compiler ID: Compiler versions must be a valid, numeric version string. This test helps catch errors in compiler identification. diff --git a/Tests/CMakeOnly/CompilerIdC/CMakeLists.txt b/Tests/CMakeOnly/CompilerIdC/CMakeLists.txt index 848ffdd..6fea73e 100644 --- a/Tests/CMakeOnly/CompilerIdC/CMakeLists.txt +++ b/Tests/CMakeOnly/CompilerIdC/CMakeLists.txt @@ -12,3 +12,10 @@ foreach(v message(SEND_ERROR "${v} not set!") endif() endforeach() + +# Version numbers may only contain numbers and periods. +if(NOT CMAKE_C_COMPILER_VERSION MATCHES +"^([0-9]+)(\\.([0-9]+))?(\\.([0-9]+))?(\\.([0-9]+))?$" +) + message(SEND_ERROR "Compiler version is not numeric!") +endif() diff --git a/Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt b/Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt index 94ac31e..05e6bb2 100644 --- a/Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt +++ b/Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt @@ -12,3 +12,10 @@ foreach(v message(SEND_ERROR "${v} not set!") endif() endforeach() + +# Version numbers may only contain numbers and periods. +if(NOT CMAKE_CXX_COMPILER_VERSION MATCHES +
[Cmake-commits] CMake branch, next, updated. v3.4.1-1588-g203efca
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 203efca5072f27271f5403f0188afc0bb0df767a (commit) via 09f36344eaa6adee6a238ae1320d57352eaee8f0 (commit) via a237b26d6c9821464856db283e0f83152409465b (commit) from 26d765cf6b6c6a08b03b8643cd7b408dc29a373b (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=203efca5072f27271f5403f0188afc0bb0df767a commit 203efca5072f27271f5403f0188afc0bb0df767a Merge: 26d765c 09f3634 Author: Roger LeighAuthorDate: Thu Dec 3 19:08:42 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 19:08:42 2015 -0500 Merge topic 'tiff-imported-target' into next 09f36344 Help: Document addition of FindTIFF imported targets a237b26d FindTIFF: Add imported targets and update documentation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09f36344eaa6adee6a238ae1320d57352eaee8f0 commit 09f36344eaa6adee6a238ae1320d57352eaee8f0 Author: Roger Leigh AuthorDate: Thu Dec 3 23:46:44 2015 + Commit: Roger Leigh CommitDate: Thu Dec 3 23:46:44 2015 + Help: Document addition of FindTIFF imported targets diff --git a/Help/release/dev/FindTIFF-imported-targets.rst b/Help/release/dev/FindTIFF-imported-targets.rst new file mode 100644 index 000..f8bbc14 --- /dev/null +++ b/Help/release/dev/FindTIFF-imported-targets.rst @@ -0,0 +1,4 @@ +FindTIFF-imported-targets +- + +* The :module:`FindTIFF` module now provides imported targets. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a237b26d6c9821464856db283e0f83152409465b commit a237b26d6c9821464856db283e0f83152409465b Author: Roger Leigh AuthorDate: Wed Dec 2 17:20:24 2015 + Commit: Roger Leigh CommitDate: Thu Dec 3 23:44:40 2015 + FindTIFF: Add imported targets and update documentation - Add TIFF::TIFF imported target - Document imported target - Add testcase to test the standard variables and the imported target Also: - Add TIFF_INCLUDE_DIRS to match common practice - Update documentation generally, including documenting TIFF_INCLUDE_DIRS diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake index ed092ea..e49a00d 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -2,24 +2,43 @@ # FindTIFF # # -# Find TIFF library +# Find the TIFF library (libtiff). # -# Find the native TIFF includes and library This module defines +# Imported targets +# # -# :: +# This module defines the following :prop_tgt:`IMPORTED` targets: # -# TIFF_INCLUDE_DIR, where to find tiff.h, etc. -# TIFF_LIBRARIES, libraries to link against to use TIFF. -# TIFF_FOUND, If false, do not try to use TIFF. +# ``TIFF::TIFF`` +# The TIFF library, if found. # -# also defined, but not for general use are +# Result variables +# # -# :: +# This module will set the following variables in your project: # -# TIFF_LIBRARY, where to find the TIFF library. +# ``TIFF_FOUND`` +# true if the TIFF headers and libraries were found +# ``TIFF_INCLUDE_DIR`` +# the directory containing the TIFF headers +# ``TIFF_INCLUDE_DIRS`` +# the directory containing the TIFF headers +# ``TIFF_LIBRARIES`` +# TIFF libraries to be linked +# +# Cache variables +# ^^^ +# +# The following cache variables may also be set: +# +# ``TIFF_INCLUDE_DIR`` +# the directory containing the TIFF headers +# ``TIFF_LIBRARY`` +# the path to the TIFF library #= # Copyright 2002-2009 Kitware, Inc. +# Copyright 2015 University of Dundee # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. @@ -65,7 +84,35 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF VERSION_VAR TIFF_VERSION_STRING) if(TIFF_FOUND) - set( TIFF_LIBRARIES ${TIFF_LIBRARY} ) + set(TIFF_LIBRARIES ${TIFF_LIBRARY}) + set(TIFF_INCLUDE_DIRS "${TIFF_INCLUDE_DIR}") + + if(NOT TARGET TIFF::TIFF) +add_library(TIFF::TIFF UNKNOWN IMPORTED) +if(TIFF_INCLUDE_DIRS) + set_target_properties(TIFF::TIFF PROPERTIES +INTERFACE_INCLUDE_DIRECTORIES "${TIFF_INCLUDE_DIRS}") +endif() +if(EXISTS "${TIFF_LIBRARY}") + set_target_properties(TIFF::TIFF PROPERTIES +IMPORTED_LINK_INTERFACE_LANGUAGES "C" +IMPORTED_LOCATION "${TIFF_LIBRARY}") +endif() +if(EXISTS
[Cmake-commits] CMake branch, next, updated. v3.4.1-1590-g28b3454
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 28b34545ee7e2e8de7ef8f4dbac33ae28b9d6401 (commit) via d85228770a8062b40392e26a066954f6efd4f517 (commit) from 203efca5072f27271f5403f0188afc0bb0df767a (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=28b34545ee7e2e8de7ef8f4dbac33ae28b9d6401 commit 28b34545ee7e2e8de7ef8f4dbac33ae28b9d6401 Merge: 203efca d852287 Author: Roger LeighAuthorDate: Thu Dec 3 19:33:12 2015 -0500 Commit: CMake Topic Stage CommitDate: Thu Dec 3 19:33:12 2015 -0500 Merge topic 'tiff-imported-target' into next d8522877 FindTIFF: Correct definition list indent https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d85228770a8062b40392e26a066954f6efd4f517 commit d85228770a8062b40392e26a066954f6efd4f517 Author: Roger Leigh AuthorDate: Fri Dec 4 00:32:32 2015 + Commit: Roger Leigh CommitDate: Fri Dec 4 00:32:32 2015 + FindTIFF: Correct definition list indent diff --git a/Modules/FindTIFF.cmake b/Modules/FindTIFF.cmake index e49a00d..e600498 100644 --- a/Modules/FindTIFF.cmake +++ b/Modules/FindTIFF.cmake @@ -34,7 +34,7 @@ # ``TIFF_INCLUDE_DIR`` # the directory containing the TIFF headers # ``TIFF_LIBRARY`` -# the path to the TIFF library +# the path to the TIFF library #= # Copyright 2002-2009 Kitware, Inc. --- Summary of changes: Modules/FindTIFF.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