[cmake-developers] [PATCH] CMakeFindPackageMode.cmake: fix 32/64bit detection if `file' is a symlink
From: Yury G. Kudryashov urkud.ur...@gmail.com --- Modules/CMakeFindPackageMode.cmake |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake index 4296577..bcf3014 100644 --- a/Modules/CMakeFindPackageMode.cmake +++ b/Modules/CMakeFindPackageMode.cmake @@ -71,7 +71,8 @@ if(UNIX) # use the file utility to check whether itself is 64 bit: find_program(FILE_EXECUTABLE file) if(FILE_EXECUTABLE) -execute_process(COMMAND ${FILE_EXECUTABLE} ${FILE_EXECUTABLE} OUTPUT_VARIABLE fileOutput ERROR_QUIET) +get_filename_component(FILE_ABSPATH ${FILE_EXECUTABLE} ABSOLUTE CACHE) +execute_process(COMMAND ${FILE_ABSPATH} ${FILE_ABSPATH} OUTPUT_VARIABLE fileOutput ERROR_QUIET) if(${fileOutput} MATCHES 64-bit) set(CMAKE_SIZEOF_VOID_P 8) endif() -- 1.7.8 -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0012995]: Emacs case-insensitive indentation in cmake-mode
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=12995 == Reported By:Christopher Sean Morrison Assigned To: == Project:CMake Issue ID: 12995 Category: Documentation Reproducibility:always Severity: tweak Priority: normal Status: new == Date Submitted: 2012-02-23 21:36 EST Last Modified: 2012-02-23 21:36 EST == Summary:Emacs case-insensitive indentation in cmake-mode Description: The cmake-mode.el Emacs mode would incorrectly indent cmake sources if they were written in lower-case. Attached is a patch that makes the mode case-insensitive so that it will indent correctly regardless of case used. This makes the emacs mode match cmake's own internal (case-insensitive) logic parsing. Steps to Reproduce: M-x indent-region on a .cmake source file or CMakeLists.txt file that writes uses lowercase instead of uppercase for the syntax. Example: macro(BAD_INDENT) if(some_condition) set(foo bar) else(some_condition) set(bar foo) endif(some_condition) endmacro(BAD_INDENT) == Issue History Date ModifiedUsername FieldChange == 2012-02-23 21:36 Christopher Sean MorrisonNew Issue 2012-02-23 21:36 Christopher Sean MorrisonFile Added: cmake-mode-case.patch == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] target_include_directories branch in stage
On Wed, Feb 22, 2012 at 8:36 PM, David Cole david.c...@kitware.com wrote: On Wed, Feb 22, 2012 at 3:04 PM, David Cole david.c...@kitware.com wrote: On Wed, Feb 22, 2012 at 8:05 AM, David Cole david.c...@kitware.com wrote: On Thu, Feb 16, 2012 at 4:11 PM, Stephen Kelly steve...@gmail.com wrote: David Cole wrote: Pushed down the queue again... I'll get to it soon. There are a handful of minor changes that I still need to make first. Ok. Let me know if it's anything I can do. Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers Finally pushed the most recent commits this morning... Please see the target-include-directories branch on the stage. (Not yet merged to 'next' -- but soon will be.) Question (probably for Brad): What should --help-property emit now that there are both directory and target level properties for INCLUDE_DIRECTORIES? Here's what it does: $ bin/Debug/cmake --help-property INCLUDE_DIRECTORIES cmake version 2.8.7.20120222-g56a44 INCLUDE_DIRECTORIES List of preprocessor include file search directories. This read-only property specifies the list of directories given so far to the include_directories command. It is intended for debugging purposes. So the most recent commit in the topic branch, which adds documentation for the target level property, appears useless... Should we eliminate the directory level documentation as well? Or emit both? If so, how? After we settle this one remaining point, I'll patch up the topic branch and merge it to 'next'. Thanks to everybody for your help and patience in getting this feature into CMake. Cheers, David C. Finally ready... I just force-pushed the 'target-include-directories' branch to stage again. I think it's ready for merging to 'next' -- before I do that, could I get a sanity check that the documentation in the top commit (ff44b88) is acceptable? Thanks, David All set. One more force-push after cleaning up a commit on Brad's recommendation and it is now finally merged to 'next'. Whew. Thanks for pushing on this - glad to see it get merged in and looking forward to being able to use this. Marcus -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers