[cmake-developers] CPack IFW generator
Hi CMake developers! I'm a newbie here. I like CMake and Qt. Qt is distributed with of his Qt Installer Framework (QtIFW). I decided to make friends CMake and QtIFW. I added CPack IFW generator and module FindIFW.cmake. You can copy the code and test it: git clone git://podsvirov.pro/cmake/cpackifwgenerator.git Also available preview: http://git.podsvirov.pro/?p=cmake/cpackifwgenerator.git;a=summary My code is still draft, but already knows how to create good installer based on the components. I want you to porobovali this and said their opinion. If the code you like, I'll try to support it. I'm sorry for my english. -- Regards Konstantin Podsvirov-- 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/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] Weird dependency on object files generated elsewhere
I was planning on fixing a bug related to flags and separable compilation for FindCUDA when I discovered something peculiar. I'm asking here in case I missed something with how source files are processed. I branched off of origin/master this morning. I have a macro that generates some custom commands for building object files for cuda (found in FindCUDA.cmake). CUDA_COMPILE(CUDA_FILES test_bin.cu) message(CUDA_FILES = ${CUDA_FILES}) ADD_EXECUTABLE(cuda_compile_example ${CUDA_FILES} ${source_files} main.cc external_dependency.h ) When print out CUDA_FILES I get a full path: CUDA_FILES = /Users/jbigler/code/FindCUDA/build-cmake-git/src/CMakeFiles/cuda_compile.dir//./cuda_compile_generated_test_bin.cu.o Great! When I try to compile cuda_compile_example I get this, though: make[2]: *** No rule to make target `src/CMakeFiles/cuda_compile.dir/cuda_compile_generated_test_bin.cu.o', needed by `src/cuda_compile_example'. Stop. What I don't see in my makefiles is the build rule for the object file. I can provide a reproducer, but it would require having CUDA installed. This is for OSX 10.8 with Xcode 5.1 (command line utils, so Makefile). James -- 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/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Weird dependency on object files generated elsewhere
This is also causing my CUDA separable compilation feature to break as well. I'm adding object files to the source list of a target, and this works in certain situations, but not all. James From: jamesbig...@gmail.commailto:jamesbig...@gmail.com jamesbig...@gmail.commailto:jamesbig...@gmail.com Date: Thursday, May 8, 2014 12:34 PM To: cmake-developers@cmake.orgmailto:cmake-developers@cmake.org cmake-developers@cmake.orgmailto:cmake-developers@cmake.org Subject: [cmake-developers] Weird dependency on object files generated elsewhere I was planning on fixing a bug related to flags and separable compilation for FindCUDA when I discovered something peculiar. I'm asking here in case I missed something with how source files are processed. I branched off of origin/master this morning. I have a macro that generates some custom commands for building object files for cuda (found in FindCUDA.cmake). CUDA_COMPILE(CUDA_FILES test_bin.cuhttp://test_bin.cu) message(CUDA_FILES = ${CUDA_FILES}) ADD_EXECUTABLE(cuda_compile_example ${CUDA_FILES} ${source_files} main.cc external_dependency.h ) When print out CUDA_FILES I get a full path: CUDA_FILES = /Users/jbigler/code/FindCUDA/build-cmake-git/src/CMakeFiles/cuda_compile.dir//./cuda_compile_generated_test_bin.cu.o Great! When I try to compile cuda_compile_example I get this, though: make[2]: *** No rule to make target `src/CMakeFiles/cuda_compile.dir/cuda_compile_generated_test_bin.cu.o', needed by `src/cuda_compile_example'. Stop. What I don't see in my makefiles is the build rule for the object file. I can provide a reproducer, but it would require having CUDA installed. This is for OSX 10.8 with Xcode 5.1 (command line utils, so Makefile). James --- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. --- -- 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/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Weird dependency on object files generated elsewhere
On Thu, May 08, 2014 at 12:34:22 -0600, James Bigler wrote: make[2]: *** No rule to make target `src/CMakeFiles/cuda_compile.dir/cuda_compile_generated_test_bin.cu.o', needed by `src/cuda_compile_example'. Stop. CMake generators will make paths relative to the build tree (I think it is to help reduce the generated output's size). What I don't see in my makefiles is the build rule for the object file. That sounds like a bug. I can provide a reproducer, but it would require having CUDA installed. Please provide it :) . Also, for the generation of the files, I don't think cuda would actually need to be there (`ln -s /usr/bin/true ~/bin/cuda` should get you at least that far). --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/cgi-bin/mailman/listinfo/cmake-developers
[CMake] Adding explicit dependencies to a target
In our project we are generating code from CORBA IDL files by adding a custom command that generates C++ code from the IDL files and a library target that depends on the generated output. This works as expected, however IDL supports include directives which are (naturally) not picked up as dependencies by CMake. To give an example: a.idl: #include b.idl #include c.idl - Here the file a.idl file includes b.idl and c.idl. The file a.idl is given as input to the custom command that processes IDL files into C++, but if I change b.idl or c.idl then the target is not rebuilt. Is it possible to add b.idl and c.idl as explicit dependencies in some way so that my target is rebuilt if these files change? I've made various attempts with add_custom_target() and add_dependencies() as well as set_source_files_properties() without any luck. Regards, -- Tarjei -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Adding explicit dependencies to a target
Hi Tarjei. add_custom_command() has a DEPENDS argument where you can list any number of files which will act as dependencies for the custom command. So you could extend your custom command like this: add_custom_command( OUTPUT ... #as before COMMAND ... #as before MAIN_DEPENDENCY a.idl DEPENDS b.idl c.idl ... # rest as before ) You have to keep in mind that this gets processed at configure time - if you change the #include-s used in a.idl, you have to modify the CMakeList and re-run CMake to get the changes picked up. It should also be possible to use the IMPLICIT_DEPENDS argument of add_custom_command() to request the C or C++ dependency scanner to run on the file, moving the dependency detection to build time. But that only works for Makefile generators. Petr On Thu, May 8, 2014 at 9:16 AM, Tarjei Knapstad tarjei.knaps...@gmail.comwrote: In our project we are generating code from CORBA IDL files by adding a custom command that generates C++ code from the IDL files and a library target that depends on the generated output. This works as expected, however IDL supports include directives which are (naturally) not picked up as dependencies by CMake. To give an example: a.idl: #include b.idl #include c.idl - Here the file a.idl file includes b.idl and c.idl. The file a.idl is given as input to the custom command that processes IDL files into C++, but if I change b.idl or c.idl then the target is not rebuilt. Is it possible to add b.idl and c.idl as explicit dependencies in some way so that my target is rebuilt if these files change? I've made various attempts with add_custom_target() and add_dependencies() as well as set_source_files_properties() without any luck. Regards, -- Tarjei -- 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://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Adding explicit dependencies to a target
Thanks a lot Petr, that solution works perfectly. Regards, -- Tarjei On 8 May 2014 11:30, Petr Kmoch petr.km...@gmail.com wrote: Hi Tarjei. add_custom_command() has a DEPENDS argument where you can list any number of files which will act as dependencies for the custom command. So you could extend your custom command like this: add_custom_command( OUTPUT ... #as before COMMAND ... #as before MAIN_DEPENDENCY a.idl DEPENDS b.idl c.idl ... # rest as before ) You have to keep in mind that this gets processed at configure time - if you change the #include-s used in a.idl, you have to modify the CMakeList and re-run CMake to get the changes picked up. It should also be possible to use the IMPLICIT_DEPENDS argument of add_custom_command() to request the C or C++ dependency scanner to run on the file, moving the dependency detection to build time. But that only works for Makefile generators. Petr On Thu, May 8, 2014 at 9:16 AM, Tarjei Knapstad tarjei.knaps...@gmail.com wrote: In our project we are generating code from CORBA IDL files by adding a custom command that generates C++ code from the IDL files and a library target that depends on the generated output. This works as expected, however IDL supports include directives which are (naturally) not picked up as dependencies by CMake. To give an example: a.idl: #include b.idl #include c.idl - Here the file a.idl file includes b.idl and c.idl. The file a.idl is given as input to the custom command that processes IDL files into C++, but if I change b.idl or c.idl then the target is not rebuilt. Is it possible to add b.idl and c.idl as explicit dependencies in some way so that my target is rebuilt if these files change? I've made various attempts with add_custom_target() and add_dependencies() as well as set_source_files_properties() without any luck. Regards, -- Tarjei -- 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://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMake for Android projects
So basically I am thinking of doing this: 1. Build my NDK libraries using the android cmake toolchain file as if I'm just building normal C++ libraries on Linux with the CMake provided makefiles in the binary output directory. 2. Create a Java project using the 'android create project' tool and check that into version control. The 'libs' directory will be empty. 3. When building the NDK libraries, install them to the corresponding libs directory for that java project (I may need to install the same library multiple times if multiple java projects depend on it). 4. Run 'ant' by hand to build the java project. Likewise I think I can import all projects into eclipse: Import the cmake build directory, and then each project in the source tree for the java side. That way I can work with it all together in the same IDE. Does this sound feasible or am I missing steps? On Wed, May 7, 2014 at 10:10 PM, J Decker d3c...@gmail.com wrote: by putting them in a directory lib/cputype On Wed, May 7, 2014 at 5:19 PM, Robert Dailey rcdailey.li...@gmail.com wrote: How do I tell my android Java project where the *.so files are so it can package them into the APK for dynamic loading when I call System.loadlibrary() on the SO files? On Tue, May 6, 2014 at 6:59 PM, Eric Wing ewmail...@gmail.com wrote: So I have 4 examples I actually tried to document. These all use my fork/derivative of the Android-CMake toolchain, which I believe comes from OpenCV. (It had grown stale with later NDKs and I hit problems). All of these rely heavily on the external NDK module system (NDK_MODULE_PATH). The first and easiest (most self contained) is: https://bitbucket.org/ewing/hello-android-almixer This one invokes ant via shell scripts outside CMake. I then recently got SDL building with CMake using the same techniques. https://bitbucket.org/ewing/sdl_android_cleanup This one doesn't invoke ant because it builds only a library. There was actually an intermediate project I helped build after ALmixer that this also drew from, JavaScriptCore, and I documented my procedure here: https://github.com/appcelerator/hyperloop/wiki/Building-JavaScriptCore-for-Android Once you have SDL built, and you set your NDK_MODULE_PATH directly, I have an Ant example and Gradle example. The ant one is just like Hello-Android-ALmixer. https://bitbucket.org/ewing/helloandroidsdl-ant https://bitbucket.org/ewing/helloandroidsdl-gradle The Gradle one is a lot of hacks. Google is ditching Ant/Eclipse for Gradle/IntelliJ, but their NDK support is even worse in the latter right now. Again, once you leave the NDK, all these things live outside CMake. I think it would be interesting to make CMake handle all of this, but I can't visualize it yet. But I hope others might be able to build on my work, like how I've built on Android-CMake. An aside, I noticed Gradle is painfully slow. Depending on how one does CMake integration, I'm not sure I want it. Just to invoke it and for it to figure out no real work needs to be done is measured in seconds for me. Thanks, Eric On 5/6/14, J Decker d3c...@gmail.com wrote: This is a page on building to android; mostly it's about my library, but names can be replaced where required https://code.google.com/p/c-system-abstraction-component-gui/wiki/BuildingForAndroid I went wit the separate cmake projects because I end up with multiple android projects from the same libraries; but really it could be appended all-together On Tue, May 6, 2014 at 2:32 PM, Robert Dailey rcdailey.li...@gmail.comwrote: Well to be clear, the NDK libraries are compiled in eclipse after I generate eclipse makefiles in CMake. Ideally, I want the CMake script to also configure ant execution so that it builds java and links in the NDK libraries. You say just use the libraries, but I'm not sure what this looks like as far as CMake script is concerned. Also I think we're using the android glue stuff in our existing project, but I'm not really sure what android glue is or if it is relevant to the CMake setup. On Tue, May 6, 2014 at 2:45 PM, J Decker d3c...@gmail.com wrote: If you've built the sources into libs, you can just use the lib; my sources are much too complex of a tree for ndk to support to build as sources.. The java sources are compiled at the 'ant debug/release' step... there is a step before that I do that is 'android.bat update project --target android-14 --path' which makes a few other files from the build.xml. On Tue, May 6, 2014 at 8:42 AM, Robert Dailey rcdailey.li...@gmail.com wrote: There is also the question of how to handle the NDK sources and integrate them into the eclipse workspace. For example, I believe NDK sources must be under the 'jni' directory, but they won't be structured that way in the source tree. So I'm not sure if the jni
Re: [CMake] CMake for Android projects
yes basically INSTALL( PROGRAMS ) keeps file permissions instead of INSTALL( FILES ... ) which loses file permisisons You don't nessiciarly have to run it by hand, can add a target that could be built... There is a little more work associated with release APK --- if( CMAKE_BUILD_TYPE STREQUAL release ) set( MORE_COMMANDS COMMAND jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ${MY_KEYSTORE} bin/${Project}-${CMAKE_BUILD_TYPE}-unsigned.apk alias_name COMMAND rm -f bin/${Project}-${CMAKE_BUILD_TYPE}.apk COMMAND zipalign -v 4 bin/${Project}-${CMAKE_BUILD_TYPE}-unsigned.apk bin/${Project}-${CMAKE_BUILD_TYPE}.apk ) endif( CMAKE_BUILD_TYPE STREQUAL release ) add_custom_target( package_apk COMMAND android.bat update project --target android-14 --path . COMMAND ant.bat ${CMAKE_BUILD_TYPE} ${MORE_COMMANDS} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/package ) add_custom_target( install_apk COMMAND echo adb install command... COMMAND adb install package/bin/${Project}-${CMAKE_BUILD_TYPE}.apk ) add_custom_target( uninstall_apk COMMAND echo adb uninstall command... COMMAND adb uninstall org.d3x0r.${Project} ) On Thu, May 8, 2014 at 6:43 AM, Robert Dailey rcdailey.li...@gmail.comwrote: So basically I am thinking of doing this: 1. Build my NDK libraries using the android cmake toolchain file as if I'm just building normal C++ libraries on Linux with the CMake provided makefiles in the binary output directory. 2. Create a Java project using the 'android create project' tool and check that into version control. The 'libs' directory will be empty. 3. When building the NDK libraries, install them to the corresponding libs directory for that java project (I may need to install the same library multiple times if multiple java projects depend on it). 4. Run 'ant' by hand to build the java project. Likewise I think I can import all projects into eclipse: Import the cmake build directory, and then each project in the source tree for the java side. That way I can work with it all together in the same IDE. Does this sound feasible or am I missing steps? On Wed, May 7, 2014 at 10:10 PM, J Decker d3c...@gmail.com wrote: by putting them in a directory lib/cputype On Wed, May 7, 2014 at 5:19 PM, Robert Dailey rcdailey.li...@gmail.com wrote: How do I tell my android Java project where the *.so files are so it can package them into the APK for dynamic loading when I call System.loadlibrary() on the SO files? On Tue, May 6, 2014 at 6:59 PM, Eric Wing ewmail...@gmail.com wrote: So I have 4 examples I actually tried to document. These all use my fork/derivative of the Android-CMake toolchain, which I believe comes from OpenCV. (It had grown stale with later NDKs and I hit problems). All of these rely heavily on the external NDK module system (NDK_MODULE_PATH). The first and easiest (most self contained) is: https://bitbucket.org/ewing/hello-android-almixer This one invokes ant via shell scripts outside CMake. I then recently got SDL building with CMake using the same techniques. https://bitbucket.org/ewing/sdl_android_cleanup This one doesn't invoke ant because it builds only a library. There was actually an intermediate project I helped build after ALmixer that this also drew from, JavaScriptCore, and I documented my procedure here: https://github.com/appcelerator/hyperloop/wiki/Building-JavaScriptCore-for-Android Once you have SDL built, and you set your NDK_MODULE_PATH directly, I have an Ant example and Gradle example. The ant one is just like Hello-Android-ALmixer. https://bitbucket.org/ewing/helloandroidsdl-ant https://bitbucket.org/ewing/helloandroidsdl-gradle The Gradle one is a lot of hacks. Google is ditching Ant/Eclipse for Gradle/IntelliJ, but their NDK support is even worse in the latter right now. Again, once you leave the NDK, all these things live outside CMake. I think it would be interesting to make CMake handle all of this, but I can't visualize it yet. But I hope others might be able to build on my work, like how I've built on Android-CMake. An aside, I noticed Gradle is painfully slow. Depending on how one does CMake integration, I'm not sure I want it. Just to invoke it and for it to figure out no real work needs to be done is measured in seconds for me. Thanks, Eric On 5/6/14, J Decker d3c...@gmail.com wrote: This is a page on building to android; mostly it's about my library, but names can be replaced where required https://code.google.com/p/c-system-abstraction-component-gui/wiki/BuildingForAndroid I went wit the separate cmake projects because I end up with multiple android projects from the same libraries; but really it could be appended
[CMake] Reinstall Visual Studio macro
Somehow, I corrupted the visual studio CMake macro.. I have no idea how... However, I cant figure out how to completely remove it, and then have cmake re-install it I have been googling on and off for 2-3 weeks with no success Thanks in advance, Scott -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] Cmake and libcurl
This seems to be a warning only as cmake still works. /usr/bin/cmake: /usr/local/lib/libcurl.so.4: no version information available (required by /usr/bin/cmake) How to fix this error? I installed latest libcurl and reinstalled cmake. -- *Dzung Nguyen* PhD Student Electrical Engineering and Computer Science, Northwestern University, IL, USA http://users.eecs.northwestern.edu/~dtn419/ -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] undesirable Bdynamic/Bstatic link flags
I have a machine I'm trying to compile some code on, and CMake is apparently being smart and is inserting -Wl,-Bdynamic around some of the libraries from the CMAKE_CXX_IMPLICIT_LINK_LIBRARIES variable. Is there a way to stop that? Or is there a reason why it is doing that? Thanks, Clint -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] How to find vcvarsall.bat (e.g. at C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC)? CMAKE_LINKER?
We need to find a file named vcvarsall.bat, located in the installation directory of Visual C++, which may have one of the following path names, for example: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\ M:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\ C:\Program Files\Microsoft Visual Studio 9.0\VC\ etc. How can we retrieve this directory path name within our CMakeLists.txt? There's no standard CMake variable like ${CMAKE_COMPILER_DIR}, right? Looking at a CMakeCache.txt file generated for Visual C++ 12 (2013) by CMake 2.8.12.2, I saw exactly one variable that would help us: CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin/link.exe From there, we can easily find the path to the corresponding vcvarsall.bat. However, ${CMAKE_LINKER} appears to be left undocumented intentionally, as it appears to be an internal variable: 0008065: CMAKE_LINKER not mentioned on --help-variables http://www.cmake.org/Bug/view.php?id=8065 Closed as won't fix Does that mean we should not use ${CMAKE_LINKER}? If so, do you have another suggestion on how to find vcvarsall.bat? Kind regards, Niels -- Niels Dekker Scientific programmer LKEB, Leiden University Medical Center -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to find vcvarsall.bat (e.g. at C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC)? CMAKE_LINKER?
How about: if(EXISTS $ENV{VS110COMNTOOLS}../../VC) get_filename_component(VC11_DIR $ENV{VS110COMNTOOLS}../../VC ABSOLUTE) endif() if(EXISTS $ENV{VS120COMNTOOLS}../../VC) get_filename_component(VC12_DIR $ENV{VS120COMNTOOLS}../../VC ABSOLUTE) endif() message(STATUS VC11_DIR='${VC11_DIR}') message(STATUS VC12_DIR='${VC12_DIR}') HTH, David C. -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] Custom commands always running
There's something I'm not understanding about custom commands. I have need to run a couple of custom commands during our build that generated some output files. They are specified like this: # Build the rexx.img file add_custom_command(OUTPUT rexx.img COMMAND ./rexximage DEPENDS rexximage rxapi rexxutil ${image_class_files} ${platform_rexx_img_depends} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) add_custom_target(rexx_img ALL DEPENDS rexx.img) It produces one output file that other targets have a dependency on and it has dependencies on several files and several other targets. This is working fine with everything occurring in the proper order, but I'm a bit surprised to see this command getting run unconditionally even if none of the command dependencies have changed. Not a big issue, but the fact the output file gets updated means all of the subsequent build stages that have a dependency on the rexx.img file also get activated. Why is this happening and is there anything I can do to stop this from being generated unconditionally? Rick -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Custom commands always running
Figured out the answer on my own. The problem was how I was specifying the file names on the depends. Once I added the directory to the output file and used the directory on subsequent dependencies, this started working the way I expected. Rick On Thu, May 8, 2014 at 5:39 PM, Rick McGuire object.r...@gmail.com wrote: There's something I'm not understanding about custom commands. I have need to run a couple of custom commands during our build that generated some output files. They are specified like this: # Build the rexx.img file add_custom_command(OUTPUT rexx.img COMMAND ./rexximage DEPENDS rexximage rxapi rexxutil ${image_class_files} ${platform_rexx_img_depends} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) add_custom_target(rexx_img ALL DEPENDS rexx.img) It produces one output file that other targets have a dependency on and it has dependencies on several files and several other targets. This is working fine with everything occurring in the proper order, but I'm a bit surprised to see this command getting run unconditionally even if none of the command dependencies have changed. Not a big issue, but the fact the output file gets updated means all of the subsequent build stages that have a dependency on the rexx.img file also get activated. Why is this happening and is there anything I can do to stop this from being generated unconditionally? Rick -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] Telling cmake that .map files depend on linking?
Hi all- I'm building an executable using the standard command: add_executable(MyExe a.c b.c) I'm adjusting the CMAKE_EXE_LINKER_FLAGS to emit a mapfile, and it works. If I delete the mapfile, though, performing an incremental build doesn't regenerate the mapfile. This makes sense, since I haven't expressed to cmake that the mapfile depends on MyExe. In the above scenario, the MyExe.map isn't even a target, so cmake doesn't even know it exists. I've tried creating a custom target, but I can't create a custom command that regenerates the mapfile, since it comes from add_executable. I then tried to use add_dependencies(), but that seems to only influence the build order. I could explicitly re-run the linker as a custom command that builds a custom target, but that seems wasteful since linking does take a bit of time. It almost seems like I need some way to tell add_executable that there are more outputs than just the executable image. Is there a way to do this? If anybody could point me in the right direction, I'd appreciate it! Thanks in advance for reading. Best, Charles -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to find vcvarsall.bat (e.g. at C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC)? CMAKE_LINKER?
Thanks for your suggestions, J Decker and David. I find both approaches (using registry entry paths as hints to find_program or using $ENV{VS110COMNTOOLS}) quite interesting. However, I'd rather not have to write such code for each compiler version separately, in my CMakeLists. Also I have the impression that CMake already knows the directory path name of the selected compiler (current generator), so it would be helpful if CMake could tell me so directly. We currently find vcvarsall.bat as follows: get_filename_component(MY_LINKER_DIR ${CMAKE_LINKER} DIRECTORY) find_file(MY_VCVARSALL_BAT vcvarsall.bat ${MY_LINKER_DIR}/.. ${MY_LINKER_DIR}/../..) This appears to work fine for any Visual C++ version I have tested so far, including both 32 and 64 bits. However, it assumes that CMake generates this CMAKE_LINKER variable. Is it okay to make that assumption? Kind regards, Niels On 5/8/2014 11:09 PM, David Cole wrote: How about: if(EXISTS $ENV{VS110COMNTOOLS}../../VC) get_filename_component(VC11_DIR $ENV{VS110COMNTOOLS}../../VC ABSOLUTE) endif() if(EXISTS $ENV{VS120COMNTOOLS}../../VC) get_filename_component(VC12_DIR $ENV{VS120COMNTOOLS}../../VC ABSOLUTE) endif() message(STATUS VC11_DIR='${VC11_DIR}') message(STATUS VC12_DIR='${VC12_DIR}') -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] find_package() vs ExternalProject_Add()
Am I correct in stating that ExternalProject_Add() cannot completely replace find_package()? e.g. if I point ExternalProject_Add() to download a software package (which uses a CMake build system and exports its targets and provides a package-config.cmake file) the only thing this does is to provide a target to download, patch, build, test, install the software in question, yes? It doesn't look for any project-config.cmake file, to help setup include dirs, etc., correct? So if a project providing a config.cmake file is downloaded, built etc. with ExternalProject_Add one still needs to then have find_package() to know what include directories need to be added etc. unless I am missing something. Clarification much appreciated. Thanks, Izaak Beekman === (301)244-9367 Princeton University Doctoral Candidate Mechanical and Aerospace Engineering ibeek...@princeton.edu UMD-CP Visiting Graduate Student Aerospace Engineering ibeek...@umiacs.umd.edu ibeek...@umd.edu -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to find vcvarsall.bat (e.g. at C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC)? CMAKE_LINKER?
In CMakeCache.txt, for a Visual Studio based build where C and/or C++ has been enabled: //CXX compiler CMAKE_CXX_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin/cl.exe //C compiler CMAKE_C_COMPILER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin/cl.exe Those are as rock solid a basis as you'll get for a typical visual studio build. I think it would be wiser to depend on those than on the CMAKE_LINKER variable. Microsoft has a habit of assuming things like this are internal implementation details, though, and they often move things around from version to version. So nothing is guaranteed. But I would think the compiler variables would be better suited if you don't want to rely on ENV or registry... I would point out however, that you don't need to rely on any cmake vars or any cmake commands having been run if you go with ENV or registry. HTH, David C. -- 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://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3022-g2deff58
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 2deff5839841562ad233357189bf7b0f5a408ee1 (commit) via b882d62d2b4e612d2291a1c78562a18843a02189 (commit) from d4e2c714a171c84609b174026d1f15f36f682cfc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2deff5839841562ad233357189bf7b0f5a408ee1 commit 2deff5839841562ad233357189bf7b0f5a408ee1 Merge: d4e2c71 b882d62 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 09:49:49 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 09:49:49 2014 -0400 Merge topic 'bug_0014849' into next b882d62d Tests: Fix FindPackageTest exported package version http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b882d62d2b4e612d2291a1c78562a18843a02189 commit b882d62d2b4e612d2291a1c78562a18843a02189 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 09:48:21 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 8 09:48:21 2014 -0400 Tests: Fix FindPackageTest exported package version Add a random version component so that the test is unlikely to conflict with other tests of the same CMake version on the same machine. diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt index 17f6b20..263f9a6 100644 --- a/Tests/FindPackageTest/CMakeLists.txt +++ b/Tests/FindPackageTest/CMakeLists.txt @@ -320,17 +320,23 @@ endif() #- # Test export(PACKAGE) with find_package. + +# Choose a unique version. +string(REGEX REPLACE -.*$ version ${CMAKE_VERSION}) +string(RANDOM LENGTH 4 ALPHABET 0123456789 v) +set(version ${version}.${v}) + message(STATUS Preparing export(PACKAGE) test project) try_compile(EXPORTER_COMPILED ${FindPackageTest_BINARY_DIR}/Exporter ${FindPackageTest_SOURCE_DIR}/Exporter CMakeTestExportPackage dummy CMAKE_FLAGS -UCMAKE_EXPORT_NO_PACKAGE_REGISTRY +-Dversion=${version} OUTPUT_VARIABLE output) message(STATUS Searching for export(PACKAGE) test project) set(CMakeTestExportPackage_DIR CACHE FILEPATH Wipe out find results for testing. FORCE) -string(REGEX REPLACE -.*$ version ${CMAKE_VERSION}) find_package(CMakeTestExportPackage 1.${version} EXACT REQUIRED) message(STATUS Searching for export(PACKAGE) test project with CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=TRUE) @@ -355,6 +361,7 @@ try_compile(EXPORTER_COMPILED ${FindPackageTest_SOURCE_DIR}/Exporter CMakeTestExportPackage dummy CMAKE_FLAGS -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE +-Dversion=${version} OUTPUT_VARIABLE output) message(STATUS Searching for export(PACKAGE) test project) find_package(CMakeTestExportPackage 1.${version} EXACT QUIET) diff --git a/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in b/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in index 42bd84e..6eac6e6 100644 --- a/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in +++ b/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in @@ -1,5 +1,5 @@ # Test config file. -set(PACKAGE_VERSION 1.@CMAKE_VERSION@) +set(PACKAGE_VERSION 1.@version@) if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION}) set(PACKAGE_VERSION_COMPATIBLE 1) set(PACKAGE_VERSION_EXACT 1) --- Summary of changes: Tests/FindPackageTest/CMakeLists.txt |9 - .../Exporter/CMakeTestExportPackageConfigVersion.cmake.in |2 +- 2 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-824-g159cc31
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 159cc31f633b89498f1989569dfde3d0b822e671 (commit) via 0c4c29edf289fc23cd0676ec591c717cd495afae (commit) from ef595af8b305645d1f17a11005a708e4145c7f5d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=159cc31f633b89498f1989569dfde3d0b822e671 commit 159cc31f633b89498f1989569dfde3d0b822e671 Merge: ef595af 0c4c29e Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:27:46 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 11:27:46 2014 -0400 Merge topic 'desktop-icon' 0c4c29ed cmake-gui: Fix desktop file icon configuration --- Summary of changes: Source/QtDialog/CMake.desktop |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-843-g7b3def9
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 7b3def93b630ee7964b1d33b2b601e07c7797438 (commit) via 205215fb8a8aa950026d914377a54ae358a1c02a (commit) via 1df2116bfaa4c575404ae1eef225aed1530d668a (commit) via c4f4dac2d550f0a8a44530187eac2ad03191c981 (commit) via 5bb7ce724c8b93d390adb17ec0eb7970520ed114 (commit) via 64254e7a74455d194092c9dba64e8d5c910a8f21 (commit) via 0d9c99bf04513bd2fd69e3673f9469c4cd69dc4c (commit) via dc7639bdabee1d2b8c82b64a65607e7dbe29cd5a (commit) from 6eafe843ca632eadd896cca95c42420b48e2a9a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b3def93b630ee7964b1d33b2b601e07c7797438 commit 7b3def93b630ee7964b1d33b2b601e07c7797438 Merge: 6eafe84 205215f Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:27:53 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 11:27:53 2014 -0400 Merge topic 'decay-language-version' 205215fb cmTarget: Add CXX_STANDARD_REQUIRED to control decay. 1df2116b Features: Decay language flag if requested is not available. c4f4dac2 Project: Fix exit-on-error with compile feature tests. 5bb7ce72 Project: Use nullary form of main for compile feature tests. 64254e7a Project: Remove extern from static string in feature tests. 0d9c99bf Help: Fix order of help entries. dc7639bd Tests: Fix name of cache variable. --- Summary of changes: Help/manual/cmake-properties.7.rst |3 +- Help/manual/cmake-variables.7.rst |3 +- Help/prop_tgt/CXX_STANDARD.rst | 17 - Help/prop_tgt/CXX_STANDARD_REQUIRED.rst| 14 + Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst |8 +++ Modules/Compiler/GNU-CXX.cmake |9 +-- Modules/Internal/FeatureTesting.cmake |4 +- Source/cmLocalGenerator.cxx| 66 ++-- Source/cmTarget.cxx|1 + Tests/CompileFeatures/CMakeLists.txt |3 + Tests/ExportImport/Import/Interface/CMakeLists.txt |4 +- .../RequireCXX11-result.txt} |0 .../CompileFeatures/RequireCXX11-stderr.txt|3 + Tests/RunCMake/CompileFeatures/RequireCXX11.cmake |4 ++ .../RequireCXX11Ext-result.txt}|0 .../CompileFeatures/RequireCXX11Ext-stderr.txt |3 + .../RunCMake/CompileFeatures/RequireCXX11Ext.cmake |5 ++ .../RequireCXX11ExtVariable-result.txt}|0 .../RequireCXX11ExtVariable-stderr.txt |3 + .../CompileFeatures/RequireCXX11ExtVariable.cmake |5 ++ .../RequireCXX11Variable-result.txt} |0 .../RequireCXX11Variable-stderr.txt|3 + .../CompileFeatures/RequireCXX11Variable.cmake |4 ++ .../RequireCXX98-result.txt} |0 .../CompileFeatures/RequireCXX98-stderr.txt|3 + Tests/RunCMake/CompileFeatures/RequireCXX98.cmake |4 ++ .../RequireCXX98Ext-result.txt}|0 .../CompileFeatures/RequireCXX98Ext-stderr.txt |3 + .../RunCMake/CompileFeatures/RequireCXX98Ext.cmake |5 ++ .../RequireCXX98ExtVariable-result.txt}|0 .../RequireCXX98ExtVariable-stderr.txt |3 + .../CompileFeatures/RequireCXX98ExtVariable.cmake |5 ++ .../RequireCXX98Variable-result.txt} |0 .../RequireCXX98Variable-stderr.txt|3 + .../CompileFeatures/RequireCXX98Variable.cmake |4 ++ Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 15 + .../CompileFeatures/generate_feature_list.cmake| 19 ++ 37 files changed, 208 insertions(+), 18 deletions(-) create mode 100644 Help/prop_tgt/CXX_STANDARD_REQUIRED.rst create mode 100644 Help/variable/CMAKE_CXX_STANDARD_REQUIRED.rst copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt = CompileFeatures/RequireCXX11-result.txt} (100%) create mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11-stderr.txt create mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt = CompileFeatures/RequireCXX11Ext-result.txt} (100%) create mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Ext-stderr.txt create mode 100644 Tests/RunCMake/CompileFeatures/RequireCXX11Ext.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-827-gd02e58c
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 d02e58c4709c76bd19aeeac29cb845dc91aebf11 (commit) via 1f646c6ce0766f8ab59868e7cac24034e6966504 (commit) via 0e4a2c7e3251c305cc4a9a02fa32011b3c142f5a (commit) from 159cc31f633b89498f1989569dfde3d0b822e671 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d02e58c4709c76bd19aeeac29cb845dc91aebf11 commit d02e58c4709c76bd19aeeac29cb845dc91aebf11 Merge: 159cc31 1f646c6 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:27:49 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 11:27:49 2014 -0400 Merge topic 'ncurses-tinfo' 1f646c6c FindCurses: Detect and satisfy ncurses dependency on tinfo 0e4a2c7e FindCurses: Honor CURSES_NEED_NCURSES when curses is found --- Summary of changes: Modules/FindCurses.cmake | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-835-g6eafe84
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 6eafe843ca632eadd896cca95c42420b48e2a9a2 (commit) via 3b59f8b7c68127c649fd72983e6f0a24cbb51427 (commit) via 8896501b236258f6908a59eb81f49983892bdcff (commit) via 23f451bb33c384d19ec29934b2811e081ff3e685 (commit) via 30a99f5c063d1d66a40b57554a7beec5d8fbf54c (commit) via 36ed5894840f40f6859710d44be607c929e5d38c (commit) via 9a083bce83cfa31192ad34ba504454f8087c4fce (commit) via 9d285600d484c8e539801310f2c4bbe2bb4daef8 (commit) from d02e58c4709c76bd19aeeac29cb845dc91aebf11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6eafe843ca632eadd896cca95c42420b48e2a9a2 commit 6eafe843ca632eadd896cca95c42420b48e2a9a2 Merge: d02e58c 3b59f8b Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:27:51 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 11:27:51 2014 -0400 Merge topic 'compiler-id-refactor' 3b59f8b7 Project: Refactor C compiler determination into multiple files. 8896501b CompilerId: Allow specifying a prefix for preprocessor defines. 23f451bb CompilerId: Guard the platform-default compiler code with a parameter. 30a99f5c CompilerId: Add option to generate compiler-id-specific defines. 36ed5894 CompilerId: Allow specifying the compiler-specific components to generate. 9a083bce Project: Split the compiler id detection into a separate function. 9d285600 Project: Generate the CXX compiler Id test from multiple files. --- Summary of changes: Modules/CMakeCCompilerId.c.in | 225 +--- Modules/CMakeCXXCompilerId.cpp.in | 219 +-- Modules/CMakeCompilerIdDetection.cmake | 151 + Modules/CMakeDetermineCompilerId.cmake |9 + Modules/Compiler/ADSP-DetermineCompiler.cmake | 10 + .../Compiler/AppleClang-DetermineCompiler.cmake|7 + Modules/Compiler/Borland-DetermineCompiler.cmake |7 + Modules/Compiler/Clang-DetermineCompiler.cmake |4 + .../Compiler/Clang-DetermineCompilerInternal.cmake | 11 + .../Compiler/Comeau-CXX-DetermineCompiler.cmake|7 + Modules/Compiler/Compaq-C-DetermineCompiler.cmake |8 + .../Compiler/Compaq-CXX-DetermineCompiler.cmake|8 + Modules/Compiler/Cray-DetermineCompiler.cmake |6 + .../Compiler/Embarcadero-DetermineCompiler.cmake |7 + Modules/Compiler/GNU-DetermineCompiler.cmake |9 + Modules/Compiler/HP-C-DetermineCompiler.cmake |8 + Modules/Compiler/HP-CXX-DetermineCompiler.cmake|8 + Modules/Compiler/IAR-DetermineCompiler.cmake |4 + .../IBMCPP-C-DetermineVersionInternal.cmake|6 + .../IBMCPP-CXX-DetermineVersionInternal.cmake |6 + Modules/Compiler/Intel-DetermineCompiler.cmake | 22 ++ Modules/Compiler/MIPSpro-DetermineCompiler.cmake | 15 ++ Modules/Compiler/MSVC-DetermineCompiler.cmake | 19 ++ .../Compiler/OpenWatcom-DetermineCompiler.cmake| 10 + Modules/Compiler/PGI-DetermineCompiler.cmake |9 + Modules/Compiler/PathScale-DetermineCompiler.cmake |9 + Modules/Compiler/SCO-DetermineCompiler.cmake |2 + Modules/Compiler/SDCC-C-DetermineCompiler.cmake| 10 + Modules/Compiler/SunPro-C-DetermineCompiler.cmake | 15 ++ .../Compiler/SunPro-CXX-DetermineCompiler.cmake| 15 ++ Modules/Compiler/TI-DetermineCompiler.cmake|8 + Modules/Compiler/TinyCC-C-DetermineCompiler.cmake |2 + .../Compiler/VisualAge-C-DetermineCompiler.cmake |4 + .../Compiler/VisualAge-CXX-DetermineCompiler.cmake |4 + Modules/Compiler/Watcom-DetermineCompiler.cmake| 10 + Modules/Compiler/XL-C-DetermineCompiler.cmake |4 + Modules/Compiler/XL-CXX-DetermineCompiler.cmake|4 + Modules/Compiler/zOS-C-DetermineCompiler.cmake |4 + Modules/Compiler/zOS-CXX-DetermineCompiler.cmake |4 + 39 files changed, 448 insertions(+), 442 deletions(-) create mode 100644 Modules/CMakeCompilerIdDetection.cmake create mode 100644 Modules/Compiler/ADSP-DetermineCompiler.cmake create mode 100644 Modules/Compiler/AppleClang-DetermineCompiler.cmake create mode 100644 Modules/Compiler/Borland-DetermineCompiler.cmake create mode 100644 Modules/Compiler/Clang-DetermineCompiler.cmake create mode 100644 Modules/Compiler/Clang-DetermineCompilerInternal.cmake create mode 100644
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3033-gede47f8
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 ede47f8519ce1ed6368af782035a95d7d7bf7d33 (commit) via f1d504d6cd1812812520326171c4819febb76325 (commit) via a07b979c1c1b6e89209889f4b1fe70d0e9ca6d45 (commit) via 65a71a5db2836096c6d6b58749d3c7b118b6b200 (commit) via 3e206022abede98b60c9932e50034e23ba677d0f (commit) via 9add7071a589892c856bbfd53aa79b352c3f3c08 (commit) via 7b3def93b630ee7964b1d33b2b601e07c7797438 (commit) via 6eafe843ca632eadd896cca95c42420b48e2a9a2 (commit) via d02e58c4709c76bd19aeeac29cb845dc91aebf11 (commit) via 159cc31f633b89498f1989569dfde3d0b822e671 (commit) via ef595af8b305645d1f17a11005a708e4145c7f5d (commit) from 2deff5839841562ad233357189bf7b0f5a408ee1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ede47f8519ce1ed6368af782035a95d7d7bf7d33 commit ede47f8519ce1ed6368af782035a95d7d7bf7d33 Merge: 2deff58 f1d504d Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:29:18 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 8 11:29:18 2014 -0400 Merge branch 'master' into next --- 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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-849-g3e20602
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 3e206022abede98b60c9932e50034e23ba677d0f (commit) via 4779542157c4fee31eedcd3c057fb19bdffe47bd (commit) via aa283b6b0137dad796af2e5c58912783790cc849 (commit) via bbfd4cd48fd7966ac5a539028fc3e397643f5593 (commit) from 9add7071a589892c856bbfd53aa79b352c3f3c08 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e206022abede98b60c9932e50034e23ba677d0f commit 3e206022abede98b60c9932e50034e23ba677d0f Merge: 9add707 4779542 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:27:57 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 11:27:57 2014 -0400 Merge topic 'minor-cleanups' 47795421 Fix whitespace in docs. aa283b6b Features: Fix test for GNU 4.8.1. bbfd4cd4 Features: Include the language of the compiler in error messages. --- Summary of changes: Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst |2 +- Modules/Compiler/GNU-CXX-FeatureTests.cmake|2 +- Source/cmMakefile.cxx |4 ++-- Tests/RunCMake/CompileFeatures/NoSupportedCxxFeatures-stderr.txt |2 +- .../CompileFeatures/NoSupportedCxxFeaturesGenex-stderr.txt |2 +- .../target_compile_features/no_matching_cxx_feature-stderr.txt |2 +- .../RunCMake/target_compile_features/no_matching_cxx_feature.cmake |2 +- 7 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-845-g9add707
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 9add7071a589892c856bbfd53aa79b352c3f3c08 (commit) via b0f277db3885cf75b4a153442a3e30ecedfab049 (commit) from 7b3def93b630ee7964b1d33b2b601e07c7797438 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9add7071a589892c856bbfd53aa79b352c3f3c08 commit 9add7071a589892c856bbfd53aa79b352c3f3c08 Merge: 7b3def9 b0f277d Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:27:55 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 11:27:55 2014 -0400 Merge topic 'hp-cpp98-tests' b0f277db HP aCC: record compiler flag for Ansi C++98 support for version 3.80 onwards --- Summary of changes: Modules/Compiler/HP-CXX.cmake|9 + Tests/AliasTarget/CMakeLists.txt | 10 +- Tests/Complex/CMakeLists.txt | 15 +++ Tests/ComplexOneConfig/CMakeLists.txt| 15 +++ Tests/Module/GenerateExportHeader/CMakeLists.txt |9 + Tests/Plugin/CMakeLists.txt | 10 ++ 6 files changed, 67 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-853-ga07b979
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 a07b979c1c1b6e89209889f4b1fe70d0e9ca6d45 (commit) via 9c7f234ceb9a74e2d79e653cbeaece9bfc6211fd (commit) from 65a71a5db2836096c6d6b58749d3c7b118b6b200 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a07b979c1c1b6e89209889f4b1fe70d0e9ca6d45 commit a07b979c1c1b6e89209889f4b1fe70d0e9ca6d45 Merge: 65a71a5 9c7f234 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:28:01 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 11:28:01 2014 -0400 Merge topic 'vs-fix-MANIFESTUAC' 9c7f234c VS: Fix /MANIFESTUAC:NO linker option mapping --- Summary of changes: Source/cmVS10LinkFlagTable.h |5 + Source/cmVS11LinkFlagTable.h |5 + Source/cmVS12LinkFlagTable.h |5 + 3 files changed, 3 insertions(+), 12 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.0.0-rc4-29-g890efcb
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, release has been updated via 890efcb6077d01629ca29f9f54c90a1f0663033a (commit) via 9c7f234ceb9a74e2d79e653cbeaece9bfc6211fd (commit) via 74dc1a0be6b93fe84a0c218761e1911c9b314ab2 (commit) via 0c4c29edf289fc23cd0676ec591c717cd495afae (commit) via 2673b9394eb156ecd47f3cb683abfd3ea15a1ad1 (commit) via 54111286453894beb69ad18a9361edc2a50efc84 (commit) via d9889e002d243c69ce6c374d2ef75a76a831f749 (commit) via 1f646c6ce0766f8ab59868e7cac24034e6966504 (commit) via 0e4a2c7e3251c305cc4a9a02fa32011b3c142f5a (commit) from 9cb4677509aa767245cbf4bb9e655d1559bc10bd (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 - --- Summary of changes: Modules/FindCurses.cmake | 18 +++--- Source/CTest/cmCTestBuildCommand.cxx |9 + Source/QtDialog/CMake.desktop|2 +- Source/cmVS10LinkFlagTable.h |5 + Source/cmVS11LinkFlagTable.h |5 + Source/cmVS12LinkFlagTable.h |5 + Tests/CMakeLists.txt | 12 Tests/CTestTestBadGenerator/CMakeLists.txt |3 +++ .../CTestConfig.cmake|2 +- .../test.cmake.in| 10 +- 10 files changed, 49 insertions(+), 22 deletions(-) create mode 100644 Tests/CTestTestBadGenerator/CMakeLists.txt copy Tests/{CTestTestCycle = CTestTestBadGenerator}/CTestConfig.cmake (83%) copy Tests/{CTestTestDepends = CTestTestBadGenerator}/test.cmake.in (79%) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-860-gdf6ff64
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 df6ff642d0f9ab40a18c04682f2f4b8b113e2060 (commit) via 890efcb6077d01629ca29f9f54c90a1f0663033a (commit) via 74dc1a0be6b93fe84a0c218761e1911c9b314ab2 (commit) via 2673b9394eb156ecd47f3cb683abfd3ea15a1ad1 (commit) via d9889e002d243c69ce6c374d2ef75a76a831f749 (commit) from f1d504d6cd1812812520326171c4819febb76325 (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 - --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3039-g8a7e47f
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 8a7e47ff235c2820cdee30d9305e938044d149d3 (commit) via df6ff642d0f9ab40a18c04682f2f4b8b113e2060 (commit) via 890efcb6077d01629ca29f9f54c90a1f0663033a (commit) via 74dc1a0be6b93fe84a0c218761e1911c9b314ab2 (commit) via 2673b9394eb156ecd47f3cb683abfd3ea15a1ad1 (commit) via d9889e002d243c69ce6c374d2ef75a76a831f749 (commit) from ede47f8519ce1ed6368af782035a95d7d7bf7d33 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a7e47ff235c2820cdee30d9305e938044d149d3 commit 8a7e47ff235c2820cdee30d9305e938044d149d3 Merge: ede47f8 df6ff64 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:31:10 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 8 11:31:10 2014 -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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3049-gb067a55
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 b067a553c3abd7463557d67b92d90b6798df3f4d (commit) via 30d750fa212ee2ac8b2b6f525eb53f919f7faa89 (commit) from 9202cdccbb894c696ea9842e942f3f97bb07b07b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b067a553c3abd7463557d67b92d90b6798df3f4d commit b067a553c3abd7463557d67b92d90b6798df3f4d Merge: 9202cdc 30d750f Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 12:02:59 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 12:02:59 2014 -0400 Merge topic 'dev/faster-evis' into next 30d750fa Help: Add release notes for policy CMP0053 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30d750fa212ee2ac8b2b6f525eb53f919f7faa89 commit 30d750fa212ee2ac8b2b6f525eb53f919f7faa89 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 11:56:55 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 8 12:02:51 2014 -0400 Help: Add release notes for policy CMP0053 diff --git a/Help/release/dev/CMP0053.rst b/Help/release/dev/CMP0053.rst new file mode 100644 index 000..3b835fb --- /dev/null +++ b/Help/release/dev/CMP0053.rst @@ -0,0 +1,6 @@ +CMP0053 +--- + +* The :manual:`cmake-language(7)` syntax for :ref:`Variable References` and + :ref:`Escape Sequences` was simplified in order to allow a much faster + implementation. See policy :policy:`CMP0053`. --- Summary of changes: Help/release/dev/CMP0053.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/CMP0053.rst hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3052-gd9538f4
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 d9538f40fe4341994c4a7a13da7cb8be0afcb405 (commit) via cb39dc60f101cc7aefe48f937ea55f696c610c7d (commit) via f782417b8cf3d9295ce33ca7214674e5db03efdd (commit) from b067a553c3abd7463557d67b92d90b6798df3f4d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9538f40fe4341994c4a7a13da7cb8be0afcb405 commit d9538f40fe4341994c4a7a13da7cb8be0afcb405 Merge: b067a55 cb39dc6 Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu May 8 12:21:33 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 12:21:33 2014 -0400 Merge topic 'WriteCompilerDetectionHeader-module' into next cb39dc60 Add the WriteCompilerDetectionHeader module. f782417b Features: Record the oldest supported compiler. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb39dc60f101cc7aefe48f937ea55f696c610c7d commit cb39dc60f101cc7aefe48f937ea55f696c610c7d Author: Stephen Kelly steve...@gmail.com AuthorDate: Mon Oct 21 16:59:40 2013 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu May 8 18:20:21 2014 +0200 Add the WriteCompilerDetectionHeader module. Provide a function to write a portable header to detect compiler features. Generate a preprocessor #error for unknown compilers and compiler versions whose features are not yet recorded. This error condition might be relaxed in the future, but for now it is useful for verification of expectations. diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 2bbe622..ecc9cc4 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -232,3 +232,4 @@ All Modules /module/UsewxWidgets /module/Use_wxWindows /module/WriteBasicConfigVersionFile + /module/WriteCompilerDetectionHeader diff --git a/Help/module/WriteCompilerDetectionHeader.rst b/Help/module/WriteCompilerDetectionHeader.rst new file mode 100644 index 000..4c81b48 --- /dev/null +++ b/Help/module/WriteCompilerDetectionHeader.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/WriteCompilerDetectionHeader.cmake diff --git a/Help/release/dev/module-WriteCompilerDetectionHeader.rst b/Help/release/dev/module-WriteCompilerDetectionHeader.rst new file mode 100644 index 000..d355d2c --- /dev/null +++ b/Help/release/dev/module-WriteCompilerDetectionHeader.rst @@ -0,0 +1,5 @@ +module-WriteCompilerDetectionHeader +--- + +* The WriteCompilerDetectionHeader module was added to allow creation of + a portable header file for compiler optional feature detection. diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake new file mode 100644 index 000..f060f0f --- /dev/null +++ b/Modules/WriteCompilerDetectionHeader.cmake @@ -0,0 +1,381 @@ +#.rst: +# WriteCompilerDetectionHeader +# +# +# This module provides the function write_compiler_detection_header(). +# +# The ``WRITE_COMPILER_DETECTION_HEADER`` function can be used to generate +# a file suitable for preprocessor inclusion which contains macros to be +# used in source code:: +# +#write_compiler_detection_header( +# FILE file +# PREFIX prefix +# COMPILERS compiler [...] +# FEATURES feature [...] +# [VERSION version] +# [PROLOG prolog] +# [EPILOG epilog] +#) +# +# The ``write_compiler_detection_header`` function generates the +# file ``file`` with macros which all have the prefix ``prefix``. +# +# ``VERSION`` may be used to specify a generation compatibility with older +# CMake versions. By default, a file is generated with compatibility with +# the :variable:`CMAKE_MINIMUM_REQUIRED_VERSION`. Newer CMake versions may +# generate additional code, and the ``VERSION`` may be used to maintain +# compatibility in the generated file while allowing the minimum CMake +# version of the project to be changed independently. +# +# ``PROLOG`` may be specified as text content to write at the start of the +# header. ``EPILOG`` may be specified as text content to write at the end +# of the header +# +# At least one ``compiler`` and one ``feature`` must be listed. Compilers +# which are known to CMake, but not specified are detected and a preprocessor +# ``#error`` is generated for them. A preprocessor macro matching +# ``${PREFIX}_COMPILER_IS_${CompilerId}`` is generated for each compiler +# known to CMake to contain the value ``0`` or ``1``. +# +# Feature Test Macros +#
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3054-g8650aca
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 8650acab7c5194a1b3b4ad3be1624ea290e51b23 (commit) via 0ac001e82a9677d59023186fe246f56c6c9d5848 (commit) from d9538f40fe4341994c4a7a13da7cb8be0afcb405 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8650acab7c5194a1b3b4ad3be1624ea290e51b23 commit 8650acab7c5194a1b3b4ad3be1624ea290e51b23 Merge: d9538f4 0ac001e Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu May 8 12:37:55 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 12:37:55 2014 -0400 Merge topic 'WriteCompilerDetectionHeader-module' into next 0ac001e8 Namespace with language. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ac001e82a9677d59023186fe246f56c6c9d5848 commit 0ac001e82a9677d59023186fe246f56c6c9d5848 Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu May 8 18:37:02 2014 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu May 8 18:37:02 2014 +0200 Namespace with language. diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index 86b55a4..96bec25 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt +++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) include(WriteCompilerDetectionHeader) -get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES) +get_property(cxx_known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES) write_compiler_detection_header( FILE ${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h @@ -15,7 +15,7 @@ write_compiler_detection_header( PROLOG // something EPILOG // more FEATURES -${known_features} +${cxx_known_features} ) if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU --- Summary of changes: Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3056-g657fcf5
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 657fcf54d92b70269cc9f8d7c7f52a981979ea61 (commit) via 2c1823ead0476b6379209396a953f1828079bf6a (commit) from 8650acab7c5194a1b3b4ad3be1624ea290e51b23 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=657fcf54d92b70269cc9f8d7c7f52a981979ea61 commit 657fcf54d92b70269cc9f8d7c7f52a981979ea61 Merge: 8650aca 2c1823e Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu May 8 12:39:58 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 12:39:58 2014 -0400 Merge topic 'WriteCompilerDetectionHeader-module' into next 2c1823ea Add the WriteCompilerDetectionHeader module. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c1823ead0476b6379209396a953f1828079bf6a commit 2c1823ead0476b6379209396a953f1828079bf6a Author: Stephen Kelly steve...@gmail.com AuthorDate: Mon Oct 21 16:59:40 2013 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu May 8 18:39:37 2014 +0200 Add the WriteCompilerDetectionHeader module. Provide a function to write a portable header to detect compiler features. Generate a preprocessor #error for unknown compilers and compiler versions whose features are not yet recorded. This error condition might be relaxed in the future, but for now it is useful for verification of expectations. diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 2bbe622..ecc9cc4 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -232,3 +232,4 @@ All Modules /module/UsewxWidgets /module/Use_wxWindows /module/WriteBasicConfigVersionFile + /module/WriteCompilerDetectionHeader diff --git a/Help/module/WriteCompilerDetectionHeader.rst b/Help/module/WriteCompilerDetectionHeader.rst new file mode 100644 index 000..4c81b48 --- /dev/null +++ b/Help/module/WriteCompilerDetectionHeader.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/WriteCompilerDetectionHeader.cmake diff --git a/Help/release/dev/module-WriteCompilerDetectionHeader.rst b/Help/release/dev/module-WriteCompilerDetectionHeader.rst new file mode 100644 index 000..d355d2c --- /dev/null +++ b/Help/release/dev/module-WriteCompilerDetectionHeader.rst @@ -0,0 +1,5 @@ +module-WriteCompilerDetectionHeader +--- + +* The WriteCompilerDetectionHeader module was added to allow creation of + a portable header file for compiler optional feature detection. diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake new file mode 100644 index 000..f060f0f --- /dev/null +++ b/Modules/WriteCompilerDetectionHeader.cmake @@ -0,0 +1,381 @@ +#.rst: +# WriteCompilerDetectionHeader +# +# +# This module provides the function write_compiler_detection_header(). +# +# The ``WRITE_COMPILER_DETECTION_HEADER`` function can be used to generate +# a file suitable for preprocessor inclusion which contains macros to be +# used in source code:: +# +#write_compiler_detection_header( +# FILE file +# PREFIX prefix +# COMPILERS compiler [...] +# FEATURES feature [...] +# [VERSION version] +# [PROLOG prolog] +# [EPILOG epilog] +#) +# +# The ``write_compiler_detection_header`` function generates the +# file ``file`` with macros which all have the prefix ``prefix``. +# +# ``VERSION`` may be used to specify a generation compatibility with older +# CMake versions. By default, a file is generated with compatibility with +# the :variable:`CMAKE_MINIMUM_REQUIRED_VERSION`. Newer CMake versions may +# generate additional code, and the ``VERSION`` may be used to maintain +# compatibility in the generated file while allowing the minimum CMake +# version of the project to be changed independently. +# +# ``PROLOG`` may be specified as text content to write at the start of the +# header. ``EPILOG`` may be specified as text content to write at the end +# of the header +# +# At least one ``compiler`` and one ``feature`` must be listed. Compilers +# which are known to CMake, but not specified are detected and a preprocessor +# ``#error`` is generated for them. A preprocessor macro matching +# ``${PREFIX}_COMPILER_IS_${CompilerId}`` is generated for each compiler +# known to CMake to contain the value ``0`` or ``1``. +# +# Feature Test Macros +# === +# +# For each compiler, a preprocessor test of the compiler version is generated +# denoting whether the each
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3058-g77773e2
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 3e22567b6ba2694fe83584429f75d5d005e7 (commit) via 58af1d47b8d5e1c8210fed76a98f586f2f369d59 (commit) from 657fcf54d92b70269cc9f8d7c7f52a981979ea61 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e22567b6ba2694fe83584429f75d5d005e7 commit 3e22567b6ba2694fe83584429f75d5d005e7 Merge: 657fcf5 58af1d4 Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu May 8 12:50:01 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 12:50:01 2014 -0400 Merge topic 'WriteCompilerDetectionHeader-module' into next 58af1d47 Simplify condition. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58af1d47b8d5e1c8210fed76a98f586f2f369d59 commit 58af1d47b8d5e1c8210fed76a98f586f2f369d59 Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu May 8 18:49:29 2014 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu May 8 18:49:29 2014 +0200 Simplify condition. diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index 96bec25..6c5e0be 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt +++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt @@ -18,8 +18,7 @@ write_compiler_detection_header( ${cxx_known_features} ) -if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU -OR (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)) +if (NOT CMAKE_CXX_COMPILE_FEATURES) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp int main(int,char**) { return 0; }\n ) --- Summary of changes: Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3060-g414ea1c
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 414ea1c2eaae96a193b8da72016d3a70f5e0d490 (commit) via aba514a6d464f7ac3b3e68b87dfeaebe45ad66b9 (commit) from 3e22567b6ba2694fe83584429f75d5d005e7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414ea1c2eaae96a193b8da72016d3a70f5e0d490 commit 414ea1c2eaae96a193b8da72016d3a70f5e0d490 Merge: 3e2 aba514a Author: Stephen Kelly steve...@gmail.com AuthorDate: Thu May 8 12:50:31 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 12:50:31 2014 -0400 Merge topic 'WriteCompilerDetectionHeader-module' into next aba514a6 Add the WriteCompilerDetectionHeader module. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aba514a6d464f7ac3b3e68b87dfeaebe45ad66b9 commit aba514a6d464f7ac3b3e68b87dfeaebe45ad66b9 Author: Stephen Kelly steve...@gmail.com AuthorDate: Mon Oct 21 16:59:40 2013 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Thu May 8 18:50:09 2014 +0200 Add the WriteCompilerDetectionHeader module. Provide a function to write a portable header to detect compiler features. Generate a preprocessor #error for unknown compilers and compiler versions whose features are not yet recorded. This error condition might be relaxed in the future, but for now it is useful for verification of expectations. diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 2bbe622..ecc9cc4 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -232,3 +232,4 @@ All Modules /module/UsewxWidgets /module/Use_wxWindows /module/WriteBasicConfigVersionFile + /module/WriteCompilerDetectionHeader diff --git a/Help/module/WriteCompilerDetectionHeader.rst b/Help/module/WriteCompilerDetectionHeader.rst new file mode 100644 index 000..4c81b48 --- /dev/null +++ b/Help/module/WriteCompilerDetectionHeader.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/WriteCompilerDetectionHeader.cmake diff --git a/Help/release/dev/module-WriteCompilerDetectionHeader.rst b/Help/release/dev/module-WriteCompilerDetectionHeader.rst new file mode 100644 index 000..d355d2c --- /dev/null +++ b/Help/release/dev/module-WriteCompilerDetectionHeader.rst @@ -0,0 +1,5 @@ +module-WriteCompilerDetectionHeader +--- + +* The WriteCompilerDetectionHeader module was added to allow creation of + a portable header file for compiler optional feature detection. diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake new file mode 100644 index 000..f060f0f --- /dev/null +++ b/Modules/WriteCompilerDetectionHeader.cmake @@ -0,0 +1,381 @@ +#.rst: +# WriteCompilerDetectionHeader +# +# +# This module provides the function write_compiler_detection_header(). +# +# The ``WRITE_COMPILER_DETECTION_HEADER`` function can be used to generate +# a file suitable for preprocessor inclusion which contains macros to be +# used in source code:: +# +#write_compiler_detection_header( +# FILE file +# PREFIX prefix +# COMPILERS compiler [...] +# FEATURES feature [...] +# [VERSION version] +# [PROLOG prolog] +# [EPILOG epilog] +#) +# +# The ``write_compiler_detection_header`` function generates the +# file ``file`` with macros which all have the prefix ``prefix``. +# +# ``VERSION`` may be used to specify a generation compatibility with older +# CMake versions. By default, a file is generated with compatibility with +# the :variable:`CMAKE_MINIMUM_REQUIRED_VERSION`. Newer CMake versions may +# generate additional code, and the ``VERSION`` may be used to maintain +# compatibility in the generated file while allowing the minimum CMake +# version of the project to be changed independently. +# +# ``PROLOG`` may be specified as text content to write at the start of the +# header. ``EPILOG`` may be specified as text content to write at the end +# of the header +# +# At least one ``compiler`` and one ``feature`` must be listed. Compilers +# which are known to CMake, but not specified are detected and a preprocessor +# ``#error`` is generated for them. A preprocessor macro matching +# ``${PREFIX}_COMPILER_IS_${CompilerId}`` is generated for each compiler +# known to CMake to contain the value ``0`` or ``1``. +# +# Feature Test Macros +# === +# +# For each compiler, a preprocessor test of the compiler version is generated +# denoting whether the each
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-869-gd91c0f7
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 d91c0f7a3f406dcf5c803e86ad6ac2e75ec0b85f (commit) via 90f66381d3a8f5ba4fd5393e2ce9032d617f08bc (commit) via 6804cd042e367954c9cf8d52392f1c3f59aaed70 (commit) via 411f77d14f0cea36aeaf04b01d3fdf2ea7ec2173 (commit) via bc3856586388a610ef3d06d51c212a9ed25856c4 (commit) via 25102efc1db1e0d165ebe5e4eaef33b8206d9d3e (commit) via e423f1c05d6d11483deb7acd135623df8de45655 (commit) via c179b2898eb507c0e4e169665d8698f1efb05f16 (commit) via c3d98bd28994bea455a1a2ca37c2a693aa9415a7 (commit) from df6ff642d0f9ab40a18c04682f2f4b8b113e2060 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d91c0f7a3f406dcf5c803e86ad6ac2e75ec0b85f commit d91c0f7a3f406dcf5c803e86ad6ac2e75ec0b85f Merge: df6ff64 90f6638 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 13:25:06 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 13:25:06 2014 -0400 Merge topic 'dev/faster-evis' 90f66381 Help: Add release notes for policy CMP0053 6804cd04 Help: Add documentation on escaping changes with CMP0053 411f77d1 EVIS: Add tests for syntax corner cases and CMP0053 bc385658 EVIS: Reimplement using custom parsing code 25102efc EVIS: Add policy CMP0053 e423f1c0 Windows: Avoid () in environment variable references c179b289 Help: Add more reference targets to cmake-language.7 c3d98bd2 Utilities/Release: Use ${VAR} instead of @VAR@ syntax --- Summary of changes: Help/manual/cmake-language.7.rst | 23 +- Help/manual/cmake-policies.7.rst |1 + Help/policy/CMP0010.rst|3 + Help/policy/CMP0053.rst| 44 ++ Help/release/dev/CMP0053.rst |6 + Modules/InstallRequiredSystemLibraries.cmake |3 +- Modules/Platform/WindowsPaths.cmake|5 +- Source/cmMakefile.cxx | 461 +++- Source/cmMakefile.h| 25 +- Source/cmPolicies.cxx |5 + Source/cmPolicies.h|2 + Tests/RunCMake/Syntax/CMP0053-At-NEW-stderr.txt|1 + Tests/RunCMake/Syntax/CMP0053-At-NEW.cmake |9 + Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt|1 + Tests/RunCMake/Syntax/CMP0053-At-OLD.cmake |9 + .../Syntax/CMP0053-At-WARN-newlines-stderr.txt | 27 ++ .../RunCMake/Syntax/CMP0053-At-WARN-newlines.cmake |6 + Tests/RunCMake/Syntax/CMP0053-At-WARN-stderr.txt | 21 + Tests/RunCMake/Syntax/CMP0053-At-WARN.cmake|4 + Tests/RunCMake/Syntax/CMP0053-NUL-stderr.txt | 56 +++ Tests/RunCMake/Syntax/CMP0053-NUL.cmake|6 + .../CMP0053-NameWithCarriageReturn-result.txt} |0 .../CMP0053-NameWithCarriageReturn-stderr.txt |4 + .../Syntax/CMP0053-NameWithCarriageReturn.cmake|2 + .../CMP0053-NameWithCarriageReturnQuoted.cmake |2 + .../CMP0053-NameWithEscapedSpaces-result.txt} |0 .../CMP0053-NameWithEscapedSpaces-stderr.txt |4 + .../Syntax/CMP0053-NameWithEscapedSpaces.cmake |2 + .../CMP0053-NameWithEscapedSpacesQuoted.cmake |2 + .../CMP0053-NameWithEscapedTabs-result.txt}|0 .../Syntax/CMP0053-NameWithEscapedTabs-stderr.txt |4 + .../Syntax/CMP0053-NameWithEscapedTabs.cmake |2 + .../Syntax/CMP0053-NameWithEscapedTabsQuoted.cmake |2 + .../CMP0053-NameWithNewline-result.txt}|0 .../Syntax/CMP0053-NameWithNewline-stderr.txt |4 + .../RunCMake/Syntax/CMP0053-NameWithNewline.cmake |2 + .../Syntax/CMP0053-NameWithNewlineQuoted.cmake |2 + .../CMP0053-NameWithSpaces-result.txt} |0 .../Syntax/CMP0053-NameWithSpaces-stderr.txt | 12 + Tests/RunCMake/Syntax/CMP0053-NameWithSpaces.cmake |2 + .../CMP0053-NameWithSpacesQuoted-result.txt} |0 .../Syntax/CMP0053-NameWithSpacesQuoted-stderr.txt | 12 + .../Syntax/CMP0053-NameWithSpacesQuoted.cmake |2 + .../CMP0053-NameWithTabs-result.txt} |0 .../Syntax/CMP0053-NameWithTabs-stderr.txt | 12 + Tests/RunCMake/Syntax/CMP0053-NameWithTabs.cmake |2 + .../CMP0053-NameWithTabsQuoted-result.txt} |0 .../Syntax/CMP0053-NameWithTabsQuoted-stderr.txt | 12 + .../Syntax/CMP0053-NameWithTabsQuoted.cmake
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3071-g8e68fe7
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 8e68fe77f7d446cb21cf8709f92054ceac512654 (commit) via d91c0f7a3f406dcf5c803e86ad6ac2e75ec0b85f (commit) from d43bedd09434e762116846b78043148dbc95c670 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e68fe77f7d446cb21cf8709f92054ceac512654 commit 8e68fe77f7d446cb21cf8709f92054ceac512654 Merge: d43bedd d91c0f7 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 13:26:19 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 8 13:26:19 2014 -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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3073-g186e765
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 186e765d1cda1914e942e72b3282fe791fbfe1e4 (commit) via dc3c210244d93a4828423a336cf8032ab1300fe8 (commit) from 8e68fe77f7d446cb21cf8709f92054ceac512654 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=186e765d1cda1914e942e72b3282fe791fbfe1e4 commit 186e765d1cda1914e942e72b3282fe791fbfe1e4 Merge: 8e68fe7 dc3c210 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 14:14:32 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Thu May 8 14:14:32 2014 -0400 Merge topic 'osx-package-DragNDrop' into next dc3c2102 OS X: Package with DragNDrop instead of PackageMaker http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc3c210244d93a4828423a336cf8032ab1300fe8 commit dc3c210244d93a4828423a336cf8032ab1300fe8 Author: Brad King brad.k...@kitware.com AuthorDate: Thu May 8 13:38:33 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Thu May 8 14:13:20 2014 -0400 OS X: Package with DragNDrop instead of PackageMaker Use the CPack DragNDrop generator instead of the deprecated PackageMaker tool to package CMake itself. This provides an installation experience that is more consistent with other products on OS X and allows users to select the destination directory easily. It also avoids installing /private/var/db/receipts/com.Kitware.CMake.* receipts that must be removed by pkgutil --forget com.Kitware.CMake before another version of CMake can be installed. The DragNDrop installer does not support a post-flight script, so drop our configuration of it. The cmake-gui has an option for installing symbolic links to enable command-line use. In practice users may simply add /Applications/CMake.app/Contents/bin to their PATH instead. diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 7885a0c..8da88c1 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -154,14 +154,6 @@ if(UNIX) endif() if(APPLE) - set(CMAKE_POSTFLIGHT_SCRIPT -${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh) - set(CMAKE_POSTUPGRADE_SCRIPT -${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh) - configure_file(${CMake_SOURCE_DIR}/Source/QtDialog/postflight.sh.in -${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh) - configure_file(${CMake_SOURCE_DIR}/Source/QtDialog/postupgrade.sh.in -${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh) install(CODE execute_process(COMMAND ln -s \../MacOS/CMake\ cmake-gui WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)) endif() diff --git a/Source/QtDialog/QtDialogCPack.cmake.in b/Source/QtDialog/QtDialogCPack.cmake.in index 3196471..7ae8605 100644 --- a/Source/QtDialog/QtDialogCPack.cmake.in +++ b/Source/QtDialog/QtDialogCPack.cmake.in @@ -9,9 +9,6 @@ if(CMAKE_PACKAGE_QTGUI) # / and then install # cmake into the bundle for cmake-gui and must use DESTDIR set(CPACK_SET_DESTDIR TRUE) -# we also want to run post install stuff to setup command line -set(CPACK_POSTFLIGHT_SCRIPT @CMAKE_POSTFLIGHT_SCRIPT@) -set(CPACK_POSTUPGRADE_SCRIPT @CMAKE_POSTUPGRADE_SCRIPT@) endif() endif() diff --git a/Source/QtDialog/postflight.sh.in b/Source/QtDialog/postflight.sh.in deleted file mode 100755 index 0b96889..000 --- a/Source/QtDialog/postflight.sh.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -$2@CMAKE_INSTALL_SUBDIR@/CMake.app/Contents/MacOS/CMake --mac-install -exit 0 diff --git a/Source/QtDialog/postupgrade.sh.in b/Source/QtDialog/postupgrade.sh.in deleted file mode 100755 index 06bd986..000 --- a/Source/QtDialog/postupgrade.sh.in +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exit 0 diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake index 89c99bc..6a27119 100644 --- a/Utilities/Release/dashmacmini2_release.cmake +++ b/Utilities/Release/dashmacmini2_release.cmake @@ -5,7 +5,7 @@ set(INSTALL_PREFIX /) set(HOST dashmacmini2) set(MAKE_PROGRAM make) set(MAKE ${MAKE_PROGRAM} -j2) -set(CPACK_BINARY_GENERATORS PackageMaker TGZ TZ) +set(CPACK_BINARY_GENERATORS DragNDrop TGZ TZ) set(INITIAL_CACHE CMAKE_BUILD_TYPE:STRING=Release CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386 diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake index f18..16a30b3 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/dashmacmini5_release.cmake @@ -5,7 +5,7 @@ set(INSTALL_PREFIX /) set(HOST