Kolan Sh
d64b37b168
Merge remote-tracking branch 'origin/maint'
2016-03-12 02:00:13 +03:00
5b06896ba8
Merge branch 'wix-prevent-nsis-overwrite' into release
2016-02-09 10:35:53 -05:00
a12b0f1b19
CMake: Prevent WiX installations over existing NSIS installations
...
Use a custom action to look for Uninstall.exe in the user
selected installation prefix.
Its presence indicates a previous NSIS installation.
Inform the user and request manual resolution of the issue.
2016-02-09 10:28:57 -05:00
98d6d8f9e2
Merge branch 'install-man-conditionally' into release
2016-02-08 10:35:51 -05:00
8282547e0f
Install ccmake.1 and cmake-gui.1 conditionally with their tools ( #15957 )
2016-02-08 09:38:18 -05:00
8a8d22cf1e
CMake 3.5.0-rc1 version update
2016-02-02 08:37:05 -05:00
fae4779864
Utilities/Release: Configure Windows binary to support Windows XP
...
Compile with `-D_WIN32_WINNT=0x501` to use a WinXP-compatible API.
Compile with `-D_USING_V110_SDK71_` to tell the VS standard library
headers that we are building with a WinXP-compatible Windows SDK. Link
executables with `-subsystem:console,5.01` to make them runnable on
Windows XP. Ideally `cmake-gui` should instead be linked with
`-subsystem:windows,5.01` but with the Ninja and Makefile generators
CMake adds `-subsystem:windows` after our `-subsystem:console,5.01` flag
and the linker seems to interpret this combination as we need.
2015-12-21 10:05:03 -05:00
083312a8fd
Utilities/Release: Switch to .msi builder for Windows binary
...
Use a new build machine to produce the Windows binary using the CPack
WiX generator to produce a `.msi` installer.
2015-12-21 09:52:28 -05:00
240b065faa
Utilities/Release: Optionally load environment on remote build server
2015-12-21 09:52:28 -05:00
a95b47154e
Utilities/Release: Add optional remote launcher to ssh calls
2015-12-21 09:52:28 -05:00
a53e0168c3
Merge topic 'import-kwiml'
...
a5dd0c9d036b6ef7122933713fdbb0a855b21d07c7d9a249
2015-12-21 09:41:09 -05:00
f9e3ca46cb
Merge topic 'release-wix-config-ng'
...
24cdb9dfde77d4a738d723b3
2015-12-18 10:55:35 -05:00
a5dd0c9d42
Add option to use a system-installed KWIML
...
Do not activate it with the general use-system-libs options for now
because KWIML is not commonly distributed or available.
2015-12-18 10:02:28 -05:00
036b6ef7c4
Port CMake from cmIML to KWIML
...
KWIML no longer uses a configured prefix.
2015-12-18 10:02:07 -05:00
12293371ee
Merge branch 'upstream-KWIML' into import-kwiml
...
* upstream-KWIML:
KWIML 2015-12-09 (43f9f8d0)
2015-12-17 14:56:40 -05:00
55b21d072e
Add script to update KWIML from upstream
2015-12-17 14:56:31 -05:00
c7d9a24911
Utilities/KWIML: Drop sources to make room for fresh import
2015-12-17 14:55:38 -05:00
c4282347e2
Add script to update KWSys from upstream
2015-12-17 14:46:09 -05:00
498c36850b
Add a script to help update third-party sources
...
Use the VTK `ThirdParty/update-common.sh` script as of commit
2f24b7b0f60b67a2a28b9aef210f06f904e7a977.
Co-Author: Brad King <brad.king@kitware.com>
2015-12-17 14:44:53 -05:00
24cdb9df59
CMake: Mimic NSIS options dialog in WiX installer
2015-12-17 15:57:30 +01:00
a42bf6c5dd
Utilities/Release: Add support for copying .msi files
2015-12-10 14:30:55 -05:00
93936d78d2
Utilities/Release: Avoid repeat copy of files with same suffix
2015-12-10 14:29:37 -05:00
Kolan Sh
2cd2db18bb
Merge remote-tracking branch 'origin/master'
2015-12-02 23:44:50 +03:00
8a60e6961e
Utilities: Add BoostScanDeps script
...
This script scans Boost headers in order to determine inter-library
dependencies, using the "autolink" information embedded in the
headers for automatic linking on Windows. This information is then
output in a form suitable for use in FindBoost.cmake.
2015-12-02 09:40:17 -05:00
58c1840a19
Merge branch 'upstream-kwiml' into update-kwiml
2015-11-30 10:18:24 -05:00
Kolan Sh
867b5f8427
origin/v3.4.0 merged
2015-11-13 23:47:53 +03:00
c09acf4fdd
libarchive: Update README-CMake.txt for new snapshot
2015-10-28 08:44:47 -04:00
2f940f8995
libarchive: Drop use of pthread.h for CMake build
...
CMake does not use threads so we do not need this in our libarchive.
2015-10-28 08:44:47 -04:00
1e47381730
libarchive: Do not use pthread.h API without header
2015-10-28 08:44:47 -04:00
43d577dcb9
libarchive: Test for Clang builtin before using it
...
The __builtin_bswap16 builtin is not available on Clang 2.1.
2015-10-28 08:44:47 -04:00
85e0bb84f5
libarchive: Avoid using 'uint8_t' as bitfield type
...
The IBM XL compiler does not like it. Use plain 'unsigned' instead.
2015-10-22 10:18:27 -04:00
c70491d671
libarchive: Avoid using name 'hz'
...
AIX system headers define the symbol 'hz' as a preprocessor macro.
2015-10-22 10:18:27 -04:00
1bbba477c7
libarchive: Drop outdated CMake portability snprintf
...
The archive_read_support_format_zip.c source no longer calls snprintf
directly so we do not need a portability macro for it.
2015-10-22 10:18:26 -04:00
64bdf0b746
libarchive: Avoid non-portable u_int8_t
...
Use uint8_t that we prepare in config.h instead.
2015-10-22 10:18:26 -04:00
8f837fc9a9
libarchive: Use CommonCrypto APIs on OS X only when available
...
Use each CommonCrypto API only when using an OS X SDK version new enough
to provide it.
2015-10-22 10:18:26 -04:00
61a0251e82
libarchive: Define O_CLOEXEC when missing
...
Do this in archive_random.c as we do in several other sources already.
2015-10-22 10:18:26 -04:00
832fe4b133
libarchive: Fix VS 7.1 Debug build
...
This version of the MS C runtime library forgets to export
_byteswap_ushort.
2015-10-21 11:34:28 -04:00
0b82f51a30
libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H
2015-10-21 11:18:50 -04:00
5333c04cd0
libarchive: Drop CMake-specific Borland compiler workaround
...
We no longer build CMake with the Borland compiler.
2015-10-21 10:31:57 -04:00
e861e12f6e
libarchive: Define version macro before first use
2015-10-21 10:30:29 -04:00
932848f420
Merge branch 'libarchive-upstream' into update-libarchive
...
Resolve conflicts by integrating changes from both sides.
2015-10-21 10:18:52 -04:00
fab35c95cb
Utilities/Release: Move cygwin packages to a subdirectory
2015-10-06 10:13:28 -04:00
45fa326b6c
Utilities/Release: Drop OS X ppc/i386 binary
...
Users with OS X 10.5 or below can build from source or use an older
CMake version.
2015-10-05 13:09:04 -04:00
86cc45e3e3
CMake 3.4.0-rc1 version update
2015-10-05 10:11:00 -04:00
ec725815c9
Utilities/Release: Update path to 'cmake.exe' on Windows build machine
2015-10-01 14:11:05 -04:00
1d11f3ca68
Merge topic 'link-https-cmake.org'
...
da7276cfhttp://www.cmake.org URLs with https://cmake.org
2015-09-29 10:08:02 -04:00
da7276cf94
Replace http://www.cmake.org URLs with https://cmake.org
...
The latter is now the preferred URL for visiting cmake.org with a
browser. Convert using the shell code:
git ls-files -z | xargs -0 sed -i 's|http://www\.cmake |https://cmake |g'
2015-09-25 15:47:39 -04:00
a7fe4413d5
jsoncpp: Add missing cast to convert from char to UInt
...
When parsing digits we know our `c - '0'` expression results in a
non-negative value due to preceding conditions. Simply cast the result
to UInt. This fixes compilation on SolarisStudio 12.4.
2015-09-25 08:38:20 -04:00
75644dafe5
jsoncpp: Fix compilation as C99 on Solaris
...
In C99 mode, Solaris variants may already define isfinite, so check for
the existence first.
2015-09-14 09:40:38 -04:00
01b6ecdb41
curl: Do not use libnetwork on Apple platforms
...
Starting with OS X 10.11 there is a library called libnetwork
which will be picked up during curl configuration.
This breaks backward compatibility of the resulting binaries
because libnetwork is not available on older OS X versions.
2015-09-10 11:25:42 -04:00
Kolan Sh
Brad King
Nils Gladitz
Ben Boeckel
Roger Leigh
Marc Chevrier
Joerg Sonnenberger
Gregor Jasny