Commit Graph

92 Commits

Author SHA1 Message Date
Ben Boeckel 3742bb0d32 stringapi: Use strings for variable names
Variable names are always generated by CMake and should never be NULL.
2014-03-08 13:05:28 -05:00
Brad King d1526f825e Refactor internal resource location APIs and initialization
Rename cmSystemTools::FindExecutableDirectory to FindCMakeResources.
Teach it to compute the locations of cmake, ctest, cpack, ccmake, and
cmake-gui executables, and the location of CMAKE_ROOT.  Provide this
information from static cmSystemTools::Get<resource>() methods.
Refactor code that needs these locations to use the new APIs.

Teach FindCMakeResources to use the OS X system API to lookup the
executable location.  When running from the CMake build tree itself,
leave a file in the tree that FindCMakeResources can use to read the
location of the source tree.  This avoids the need to compile the source
tree location into a binary that may be installed and used without the
source tree.

Teach the QtDialog on OS X to create a "cmake-gui" symlink in the build
tree next to "cmake" and the other tools, as is already done in the
install tree for the application bundle.  This ensures a consistent set
of executables are available in one directory.
2013-11-12 08:23:35 -05:00
Nicolas Despres 415ffda7a8 ccmake: Extend clear line.
When configuring or generating the 'ng' of the end of the second line
is not cleared.  This patch fixes this.

The problem was introduced by commit fd632195 (ccmake: Align 'g' and 'q'
key instructions, 2011-01-07) which adjusted the length of lines that
need clearing.
2012-02-06 10:23:50 -05:00
Nicolas Despres 1dd43c4c9d ccmake: Factor clear line. 2012-02-05 15:09:37 +01:00
Nicolas Despres ceff6ec525 ccmake: Factor toggle key help instructions. 2011-10-23 22:18:14 +02:00
Nicolas Despres 19da10629d ccmake: Document '/' key. 2011-10-23 22:18:14 +02:00
Nicolas Despres fd63219557 ccmake: Align 'g' and 'q' key instructions.
They were miss-aligned with the 'enter' key instruction.

Before:
----
Press [enter] to edit option           CMake Version 2.8.3.20110107-g4b05a-dirty
Press [c] to configure
Press [h] for help         Press [q] to quit without generating
----

After:
----
Press [enter] to edit option           CMake Version 2.8.3.20110107-g4b05a-dirty
Press [c] to configure
Press [h] for help           Press [q] to quit without generating
----
2011-10-23 22:18:14 +02:00
Nicolas Despres d3d7e45df2 Remove trailing white-spaces. 2011-10-23 22:15:20 +02:00
Brad King 182eb7c7ef Merge topic 'dev/strict-mode'
dd2f814 Merge branch 'dev/add_test-working-directory' into dev/strict-mode
949d32c Unwatch manual variables upon removal in cmake-gui
3939032 Unwatch manual variables upon removal in ccmake
8354413 Add method to unwatch a manual variable
8ed3c85 Give a better message for unused variables
729db48 Fix ArgumentExpansion test expected results
89c2544 Checking for a definition is a usage
5625dee Don't output to stderr in the GUI
ad25a96 Merge branch 'ImprovedDotSupport2' into dev/strict-mode
c128abe Merge branch 'AddCMAKE_CURRENT_LIST_DIR' into dev/strict-mode
9bcaff0 Merge branch 'cmake-guiRememberAdvancedCheckbox' into dev/strict-mode
544d0c3 Fix expected output for WarnUninitialized test
4e3bea4 Update expected messages to new format
8e8c9e4 Don't check at destruction for usage
668e005 Use cmake::IssueMessage for warnings
88cd4c1 Use 'CMake Warning' versus 'warning' for CDash
3c3b98d Initialize the class before setting warn flags
cf8b15a Ignore files under the CMakeFiles directory
fd50f06 Don't check for unused vars at configure time
447a04c Don't warn during configure when doing everything
b97ee21 Check for unused variables at the end of generate
c18c977 When checking for variables, specify a reason
3f1121f Use a long int since Line is a long as well
2507f93 Change the failure case string to 'Unexpected'
fe390a2 Add 'ArgumentExpansion' test
8dbb209 Wrong boolean value for CLI warnings
d4ee998 Hard-code the --no-warn-unused-cli flag
a267b99 Fix line lengths
82ed104 Flag that the directories have been set
5aa535b Add argument to arg parsing to not set directories
367e5c3 Revert "Revert "When calling CMake, set the args and the cache""
ab5d4e4 Revert "When calling CMake, set the args and the cache"
9b90040 When calling CMake, set the args and the cache
fe56002 Fix long lines for KWStyle
5d30cfc Set a watch on variables added through the gui
33c63b1 Add a method to put a watch for variables
535253f Initialize the warning variables earlier
cbb286c Fix the path detection to work for top-level
62be1f7 Initialize the usage stack earlier
c6e7fab Factor out the checks for unused variables
5e41ba8 When using the API, check for Add vs. Remove
dee1976 Fix typo in VariableUnusedViaUnset test
f231ce5 Remove old false positive avoidance code
a117e02 Revert "Add test for unused warnings at the end of scope"
2c82f2b Exempt CMAKE(CURRENT|PARENT)_LIST_FILE from usage
6d7d449 Ignore CLI warnings for ABI determination
7740a73 Only return local keys that are defined
bef3aee Use the API so that warnings can be tracked
05cb0f4 Check for unused variables in the dtor
91c4c99 Add test for unused warnings at the end of scope
ca90f67 Fix detection of unused variables when setting
f7438ca Add test for unused detection via setting it
995cfb0 Don't warn if the variable wasn't defined
aefc91d Add test for usage checks via unset
a8e97f8 Remove VarRemoved code since it's been superceded
59463ef Rework CheckVariableForUnused usage
f117423 Fix line lengths to be no more than 78
e49a935 Improve unused warning logic
e01e40c Mark ARGC, ARGV*, and ARGN as used
a17aff7 Ignore CMAKE_MATCH_* variables for usage
02a114d Add method to allow variables to be marked as used
a0b0d23 CMAKE_DO_TRY_COMPILE is no longer used
ae3eff3 Fix the path used for ignoring system warnings
056b441 Fix missing case for usage of a variable
980e048 Factor out checks for unused variables
83acb0a Remove now unused variables
3801463 Use built-ins for readability and maintainability
8b52015 Push the initialize and unused states when copying
439877f Be consistent with single and double quotes
4cf1706 Add documentation for check-system-vars
b74777f Fix the spelling of the flag for warn-unused-vars
b948120 Change logic of flag to turn off cli unused checks
f047a17 Add test for uninitialized variables
75bda38 Add tests for unused command line variables
300fc15 Fix detection of system files
d784e6a Run the unused variables check on the final pass
9efc057 VariableWatch is not available when bootstrapping
2e78224 Add a missing comma to the warning message
7499700 Add a flag to warn about system files
fff9f6d Rename flags again and use variablewatch for cli
786e269 Add warn-unused to the Qt interface
636e6c4 Default to marking things as used
4ff0340 Rename find-unused to warn-unused
d7999e9 Rename strict-mode to warn-uninitialized
e141bc9 Detect unused variables
d3e8eb5 Add flags to detect unused variables
f332e14 Complete strict-mode checks for uninitialized vars
52f9637 Add method to get the local scope variables
f794d58 Make --strict-mode option, and integrate with cmake-gui
48b5b85 Add a warning when variables are used uninitialized.
cd626ea For macros make sure the FilePath points to a valid pointer in the args.
2011-01-27 15:34:07 -05:00
David Cole 693c9a6236 Avoid exceptions when ccmake terminal window is too small (#11668)
Thanks to Nicolas Despres for the patch.
2011-01-19 11:24:36 -05:00
Ben Boeckel 393903218d Unwatch manual variables upon removal in ccmake 2011-01-13 17:58:23 -05:00
Brad King 5d7c3c0a59 ccmake: Fix search with '/'
Commit 7a18dd8e (Add searching of variables, 2003-03-07) added method
cmCursesMainForm::JumpToCacheEntry to search for cache entries whose
names match a given search string.  The method also had a useless
argument "int idx" probably left from earlier development iterations and
hard-coded in all calls to the value '-1'.  The method compared this
argument to the "NumberOfVisibleEntries" member which at the time was of
type "int" also.

Commit ff1f8d0b (Fix or cast more integer conversions in cmake,
2010-06-29) changed the type of "NumberOfVisibleEntries" to size_t to
fix other integer conversion warnings.  An unsigned type makes sense
given the purpose of the member.  However, this caused the '-1' signed
value to be converted to a large unsigned value in the above-mentioned
comparison, leading to incorrect behavior.

Fix the problem by removing the useless argument and the comparison.
2010-09-16 17:45:27 -04:00
Brad King fec71d8016 Fix signed/unsigned comparison warnings in ccmake
Commit ff1f8d0b (Fix or cast more integer conversions in cmake) changed
a member type from int to size_t.  Update the types of variables
compared to these values to be unsigned also.
2010-06-29 11:09:36 -04:00
Brad King ff1f8d0b53 Fix or cast more integer conversions in cmake
These were revealed by GCC's -Wconversion option.  Fix types where it is
easy to do so.  Cast in cases we know the integer will not be truncated.
2010-06-29 09:52:12 -04:00
David Cole 44bcba7461 Fix warnings in CMake source code. Suppress rampant warnings emanating from Qt files. 2009-10-01 16:47:08 -04:00
Brad King 96afb12087 Convert CMake to OSI-approved BSD License
This converts the CMake license to a pure 3-clause OSI-approved BSD
License.  We drop the previous license clause requiring modified
versions to be plainly marked.  We also update the CMake copyright to
cover the full development time range.
2009-09-28 11:43:28 -04:00
Brad King b41a548d86 Add parentheses around '&&' between '||' for gcc
The GNU compiler warns about possible operator precedence mistakes and
asks for explicit parentheses (-Wparentheses).  We add the parentheses
to silence the warning.  This also fixes one real logic error in the
find_package() implementation by correcting expression evaluation order.
2009-09-11 08:18:15 -04:00
Brad King 98c51ff6dc ENH: Overhaul CMake version numbering
This moves the version numbers into an isolated configured header so
that not all of CMake needs to rebuild when the version changes.

Previously we had spaces, dashes and/or the word 'patch' randomly chosen
before the patch number.  Now we always report version numbers in the
traditional format "<major>.<minor>.<patch>[-rc<rc>]".

We still use odd minor numbers for development versions.  Now we also
use the CCYYMMDD date as the patch number of development versions, thus
allowing tests for exact CMake versions.
2009-03-05 15:17:07 -05:00
Bill Hoffman f0a41ce160 BUG: fix for 4026, display a message if ccmake has errors 2008-10-09 12:49:49 -04:00
Bill Hoffman 354abb72d9 ENH: fix it for working with an empty cache 2008-03-07 16:32:09 -05:00
Bill Hoffman 3fa087c8ab ENH: fix make edit_cache for cmake-gui 2008-02-12 09:49:42 -05:00
Bill Hoffman 33170bc371 ENH: there can be only one version 2006-11-29 17:17:16 -05:00
Ken Martin f7217ef344 ENH: remove old unused code 2006-10-06 15:33:16 -04:00
Bill Hoffman 65e3842d51 ENH: only change the cache if the value was really changed 2006-08-10 11:05:44 -04:00
Bill Hoffman e975836292 ENH: not all messages are errors 2006-03-16 11:28:13 -05:00
Ken Martin fb5d92ea37 ENH: m_ cleanup for curses 2006-03-16 10:44:55 -05:00
Brad King c7a75e92c9 COMP: Changed while(1) to for(;;) to avoid warning about constant control expression. 2005-05-03 14:57:32 -04:00
Andy Cedilnik 3bc8cbd475 ENH: Reload PreLoad.cmake every time you do configure 2004-08-17 16:13:31 -04:00
Andy Cedilnik c4805a1b79 ENH: Enable preload for ccmake 2004-08-17 15:36:28 -04:00
Bill Hoffman 2474302c25 ENH: remove deletes 2004-07-20 11:02:12 -04:00
Bill Hoffman 9fe2ab2f71 BUG: fix for 981 cursor returns to correct place in help screen 2004-07-19 13:01:40 -04:00
Brad King 4eb0400c98 ENH: Adding MODIFIED property to cache values that have been changed by the user. 2004-06-23 10:13:02 -04:00
Andy Cedilnik 0986b42761 BUG: Prevent deleting not existing variables and therefore prevent crash. Fixes: Bug #750 - CCMake crashes when deleting all variables 2004-04-15 15:46:58 -04:00
Andy Cedilnik 183273bea2 BUG: Prevent crash when deleting the last cache item 2004-02-22 22:06:33 -05:00
Brad King 88e1571c76 BUG#129: Fixed load/save of CMakeCache.txt when it is not in the current directory. 2003-08-06 18:39:16 -04:00
Andy Cedilnik 65dcf074a1 BUG: When only loading ccmake cache, do not allow generate 2003-06-06 09:57:28 -04:00
Andy Cedilnik dfd22fdf23 ENH: On envocation of ccmake check if directories are correct, but do not rerun configure 2003-05-29 11:14:48 -04:00
Andy Cedilnik 889a119474 If there was no error, do not say that there was one 2003-03-17 11:21:05 -05:00
Andy Cedilnik 729bc4cb6d Remove warnings 2003-03-09 18:16:46 -05:00
Andy Cedilnik 063d6b5ecb Remove warning 2003-03-07 11:53:20 -05:00
Andy Cedilnik 7a18dd8edd Add searching of variables 2003-03-07 11:27:28 -05:00
Brad King 486454ef78 BUG: Fixed crash when CMAKE_ROOT cannot be found. 2003-01-22 10:33:34 -05:00
Andy Cedilnik 934d7d3dd6 Rename local variable 2002-11-22 09:45:50 -05:00
Brad King a7da3d4eff ERR: Fixed string literal to char* warnings. 2002-11-21 10:03:36 -05:00
Andy Cedilnik 1d39833446 Add progress to ccmake 2002-11-19 13:09:16 -05:00
Andy Cedilnik 65a814c989 Initial add of progress 2002-11-18 16:29:14 -05:00
Andy Cedilnik 202d2ea69a Revert 2002-11-07 09:15:36 -05:00
Andy Cedilnik 3d4a2fdc52 In certain cases, try to guess the source directory, so that you can run cmake or ccmake without specifying source dir 2002-11-06 12:04:24 -05:00
Brad King 1f6a3c67b1 ENH: Added reference to Copyright.txt. Removed old reference to ITK copyright. Changed program name to CMake instead of Insight in source file header. Also removed tabs. 2002-10-23 18:03:27 -04:00
Andy Cedilnik c3007233ec Rename variables to remove warnings 2002-10-17 10:51:23 -04:00