Commit Graph

34086 Commits

Author SHA1 Message Date
Sebastian Holtermann
8c9358386b QtAutogen: Generate included ui_ and moc_ files in _automoc/includes
ui_ and moc_ files that are include in source files get generated in
$CURRENT_BUILD_DIR/$TARGETNAME_automoc/include.
The directory is added to the INCLUDE_DIRECTORIES of the origin target
in the generation stage.

From now on all autogen files get generated below
$CURRENT_BUILD_DIR/$TARGETNAME_automoc.
2016-12-07 08:24:01 -05:00
Sebastian Holtermann
8f47a5f16a cmGeneratorTarget: Add AddIncludeDirectory method (experimental) 2016-12-07 08:24:00 -05:00
Sebastian Holtermann
057ac11bfb QtAutogen: Use checksum based subdirectories to avoid name collisions 2016-12-07 08:24:00 -05:00
Sebastian Holtermann
d3afe4070b QtAutogen: Remove .dir suffix from automoc build directory 2016-12-07 08:23:59 -05:00
Sebastian Holtermann
6f53b1ab64 QtAutogen: Generate moc compilation in _automoc.dir/moc_compilation.cpp 2016-12-07 08:23:59 -05:00
Sebastian Holtermann
39e07d7a17 QtAutogen: Use upper case for MOC, UIC and RCC in messages 2016-12-07 08:23:59 -05:00
Sebastian Holtermann
8c6f990fb6 QtAutogen: New common bold logging method 2016-12-07 08:23:58 -05:00
Sebastian Holtermann
49f8687e16 QtAutogen: Make sure parent directory exists before writing files 2016-12-07 08:23:58 -05:00
Sebastian Holtermann
7731121d66 QtAutogen: Improved error handling 2016-12-07 08:23:58 -05:00
Sebastian Holtermann
00750ece6a QtAutogen: Error and warning log method tweaks 2016-12-07 08:23:58 -05:00
Sebastian Holtermann
708e44af5d QtAutogen: Improved error recognition 2016-12-07 08:23:57 -05:00
Sebastian Holtermann
1c97d1df20 QtAutogen: Improved error recognition on config load 2016-12-07 08:23:52 -05:00
Sebastian Holtermann
69871e67e3 QtAutogen: Comments 2016-12-06 15:59:27 +01:00
Sebastian Holtermann
9360e28816 QtAutogen: For loop feature test optimization 2016-12-06 15:59:27 +01:00
Sebastian Holtermann
8548caa3ee QtAutogen: Variable scope optimizations 2016-12-06 15:59:27 +01:00
Sebastian Holtermann
9d9c68e21a QtAutogen: Rename variable templates in config template 2016-12-06 15:59:27 +01:00
Sebastian Holtermann
bb8c96689f QtAutogen: Make strings const 2016-12-06 15:59:27 +01:00
Sebastian Holtermann
48180401d3 QtAutogen: Rename config AM_RELAXED_MODE to AM_MOC_RELAXED_MODE 2016-12-06 15:59:26 +01:00
Sebastian Holtermann
4fa858ecb1 QtAutogen: Change config file permissions only on demand 2016-12-06 15:59:26 +01:00
Sebastian Holtermann
273e481e48 QtAutogen: Inline single use variable 2016-12-06 15:59:26 +01:00
Sebastian Holtermann
6f024008ce QtAutogen: Remove unused intermediate definition in makefile 2016-12-06 15:59:26 +01:00
Sebastian Holtermann
ff1a01b743 QtAutogen: Moc related variable renamed 2016-12-06 15:59:26 +01:00
Sebastian Holtermann
f448364de8 QtAutogen: Moc related variable renamed 2016-12-06 15:59:26 +01:00
Sebastian Holtermann
4eadf2ce3f QtAutogen: Target directory name function rename 2016-12-06 15:59:26 +01:00
Sebastian Holtermann
2e18801a1b QtAutogen: Move util functions to file begin 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
048aac2cf9 QtAutogen: Moc related setup function rename 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
c9e2208278 QtAutogen: Uic related function rename 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
26505dfcb7 QtAutogen: Uic related setup function rename 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
fc055c04e1 QtAutogen: Rcc related function rename 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
9eba41479b QtAutogen: Rcc related function rename 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
693d85f8d6 QtAutogen: Rcc related list function rename 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
43747ee8b3 QtAutogen: Rcc related setup function rename 2016-12-06 15:59:24 +01:00
Sebastian Holtermann
8de8d3b191 QtAutogen: Remove and inline ReadAll function
The function was only used once.
2016-12-06 15:59:24 +01:00
Sebastian Holtermann
d0283dc185 QtAutogen: Use shorter name for static function 2016-12-06 15:59:24 +01:00
Sebastian Holtermann
2c9667e897 QtAutogen: Use util prefix for static function name 2016-12-06 15:59:24 +01:00
Brad King
0f37cd228e Merge topic 'FindOpenGL-imported-targets'
027ce359 FindOpenGL: Provide imported targets for GL and GLU
2016-12-06 09:26:25 -05:00
Brad King
0290bfc35d Merge topic 'update-curl'
df7fa47c curl: Disable symbol hiding logic in build for CMake
f8a1ba20 Merge branch 'upstream-curl' into update-curl
93cc249f curl 2016-11-02 (3c561c65)
25d7b1ca curl: Update script to get curl 7.51.0
2016-12-06 09:26:20 -05:00
Brad King
22f05b1d8c Merge topic 'update-kwsys'
7f307d9e Merge branch 'upstream-KWSys' into update-kwsys
1b50bd3f KWSys 2016-12-02 (4967ccc0)
2016-12-06 09:26:17 -05:00
Brad King
9cf5fe22d0 Merge topic 'wix-reg-install-dir'
4beaa926 Help: Add notes for topic 'wix-reg-install-dir'
1b91e010 Utilities/Release: Store WiX CMake install location in Windows registry
2016-12-06 09:26:12 -05:00
Brad King
4beaa926b3 Help: Add notes for topic 'wix-reg-install-dir' 2016-12-06 09:25:00 -05:00
Brad King
df7fa47c1b curl: Disable symbol hiding logic in build for CMake
We already disable the code using `HIDES_CURL_PRIVATE_SYMBOLS`, so skip
the code to set it too, thus avoiding unnecessary `message()` calls.
2016-12-06 08:18:33 -05:00
Kitware Robot
d6a1e2b90b CMake Nightly Date Stamp 2016-12-06 00:01:08 -05:00
Brad King
f8a1ba202f Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-11-02 (3c561c65)
2016-12-05 11:50:43 -05:00
Curl Upstream
93cc249f3d curl 2016-11-02 (3c561c65)
Code extracted from:

    https://github.com/curl/curl.git

at commit 3c561c657c2f0e553b19115a506592a8bbd744bc (curl-7_51_0).
2016-12-05 11:39:32 -05:00
Brad King
25d7b1ca9d curl: Update script to get curl 7.51.0 2016-12-05 11:39:12 -05:00
Brad King
41f1125931 Merge topic 'features-c++17'
97c1e569 Help: Add release note for C++ 17 support
85c8e652 Features: Activate C++ 17 support for AppleClang 6.1+
8084f7a6 Features: Activate C++ 17 support for Clang 3.5+
24e29d41 Features: Activate C++ 17 support for GNU 5.1+
ae1a6815 Features: Add infrastructure for C++ 17 language standard
684e4d20 Features: Make feature recording conditions more consistent
2016-12-05 10:56:32 -05:00
Nils Gladitz
1b91e010bc Utilities/Release: Store WiX CMake install location in Windows registry 2016-12-05 16:05:19 +01:00
Brad King
7f307d9ea6 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-12-02 (4967ccc0)
2016-12-05 09:55:34 -05:00
KWSys Upstream
1b50bd3f5c KWSys 2016-12-02 (4967ccc0)
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 4967ccc054d268c430e73445f3a103e737c5f5f7 (master).

Upstream Shortlog
-----------------

Chuck Atkins (2):
      f1afce25 DynamicLoader: Re-organize preprocessor checks to use if, elif, else
      d94f92f7 DynamicLoader: Expand noop implementation to more platforms

Dāvis Mosāns (2):
      f069db91 Encoding: Fix conversion of strings that contain null bytes
      4967ccc0 ConsoleBuf: Fix output for strings that contain null byte
2016-12-05 09:55:32 -05:00
Brad King
d59010e47f Merge topic 'test-handler-multimap'
1af67b19 cmCTestTestHandler: use multimap
2016-12-05 09:23:33 -05:00