Klaas Freitag
7d79d3d30d
Fix Search for Qt5 version Qt4
2014-04-08 12:08:01 +02:00
Daniel Molkentin
4ff39d8114
Cleanups, build if Qt5 is not on system
2014-04-07 18:08:28 +02:00
Daniel Molkentin
9f8d867ce2
About correctly when Qt5Keychain isn't found
2014-04-07 17:41:33 +02:00
Daniel Molkentin
d416c97eac
Fix Qt5 detection
2014-04-07 17:38:30 +02:00
Daniel Molkentin
7d7d03071a
Add Copyright.txt for cmake modules
...
Fixes #1438
2014-04-07 01:27:59 +02:00
Daniel Molkentin
57c59850e1
Fix installation paths
2014-04-04 15:52:41 +02:00
Daniel Molkentin
4bcd620c29
Avoid build attempts with Qt4 on Windows and Linux
2014-04-04 09:29:01 +02:00
Daniel Molkentin
9822002480
Spell APPLICATION_SHORTNAME correctly
...
Fixes #1547
2014-03-28 15:56:35 +01:00
Daniel Molkentin
411cffd3d5
NSIS: libcrypto-10 dependency got lost somehow
2014-03-26 09:10:01 +01:00
Daniel Molkentin
7c7fad78f7
Qt5: QtLocation is not needed
2014-03-25 22:52:28 +01:00
Daniel Molkentin
1c8e5ef4ee
Fix typo
2014-03-25 20:05:06 +01:00
Daniel Molkentin
45ec489f71
Merge branch 'master' of github.com:shadone/mirall into shadone-master
...
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
src/CMakeLists.txt
src/mirall/owncloudgui.cpp
2014-03-25 19:56:45 +01:00
Daniel Molkentin
dddec8b250
-fPIC is implied on Windows
2014-03-25 19:04:05 +01:00
Daniel Molkentin
06082b585a
Add translations when using Qt5 as well
2014-03-25 19:04:05 +01:00
Daniel Molkentin
4bf0a2b188
NSIS: depend on Qt5-based installations
2014-03-25 19:04:05 +01:00
Daniel Molkentin
d10aec6055
NSIS: Install owncloudcmd on Windows
2014-03-18 23:56:50 +01:00
Olivier Goffart
33289bde29
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
CMakeLists.txt
VERSION.cmake
src/CMakeLists.txt
2014-03-14 17:27:50 +01:00
Daniel Molkentin
87f3755b1f
Deploy with Qt5
2014-03-13 00:52:01 +01:00
Daniel Molkentin
3f4bcbbd62
Find Qt5 version of QtKeychain when built with Qt5
2014-03-12 18:38:59 +01:00
Daniel Molkentin
955b932806
Qt5: QtLocation is not required
2014-03-12 18:23:45 +01:00
Daniel Molkentin
e7b6560c39
cmake: Remove debug
2014-03-12 18:20:45 +01:00
Daniel Molkentin
80e583c337
Error out if a Qt module is missing
...
Fixes #1487
2014-03-12 18:18:02 +01:00
Daniel Molkentin
bc3d298491
Find QtKeychain on multiarch Debian/Ubuntu
2014-03-12 18:17:43 +01:00
Daniel Molkentin
28cf9ce1a4
Properly abort if QtKeychain is not found
...
Fixes #1486
2014-03-12 17:55:30 +01:00
Klaas Freitag
aa4e90acfc
Put ocsync to a private library - WIP
2014-03-11 10:18:07 +01:00
Denis Dzyubenko
a51cb0982b
Added Mac-specific settings dialog that looks more native
2014-02-18 02:22:16 +01:00
Daniel Molkentin
beb9752f09
Merge remote-tracking branch 'origin/1.5'
2014-02-12 21:17:06 +01:00
Daniel Molkentin
4db7b5f2a7
NSIS: accept /noautoupdate
2014-02-12 17:57:50 +01:00
Daniel Molkentin
958253bb2b
Respect skipUpdate policy from global config files and windows policy.
2014-02-12 17:55:05 +01:00
Olivier Goffart
a5379ef2aa
make BUILD_WITH_QT4 off by default
...
Rationale:
When Qt5 is not found, the script will automatically use Qt4.
However, without this change, when Qt4 is not found, it will not
try to find Qt5 because BUILD_WITH_QT4 is ON by default forbidding the
use of Qt5 even if it is installed.
Also, other packages default to Qt5 including qtkeychain
See also issue #1418
2014-02-12 11:25:08 +01:00
Thomas Müller
0322a44be5
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:24:10 +01:00
Thomas Müller
60ca442728
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:23:34 +01:00
Markus Goetz
43345dc236
Icon: Make png2ico / windres failure non-fatal
2014-02-10 14:36:32 +01:00
Thomas Müller
fdf73fe539
- Replace undeclared variables:
...
- PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE
- PageReinstall_OLD_Field_2
- PageReinstall_OLD_Field_3
- REVISION
- README.md updated - calling bin/l10n.sh was missing
This commit includes updated translations from transifex.
2014-02-05 12:01:36 +01:00
Markus Goetz
e001e70816
Sparkle: Get it working
2014-02-04 17:37:01 +01:00
Daniel Molkentin
924e7d4e39
Mac OS: Make icns generation work when building with Qt 5
2014-02-04 08:50:45 +01:00
Daniel Molkentin
cfdc6395d8
Find sparkle the first time around
2014-01-30 12:57:33 +01:00
Klaas Freitag
f2fc866cc4
Set the library and bin install path to cmake standard path.
2014-01-24 13:43:05 +01:00
Daniel Molkentin
815efb69d7
NSIS: implement /launch for updater
2014-01-23 17:17:13 +01:00
Daniel Molkentin
1d32fb74f9
NSIS: Don't try to log
2014-01-23 16:15:46 +01:00
Klaas Freitag
9c300b83bd
Add FindINotify cmake module.
2014-01-23 16:15:29 +01:00
Daniel Molkentin
f98db9ac9d
NSIS: find DLL from csync copy within cmake
2014-01-23 15:55:55 +01:00
Daniel Molkentin
484ad28cd6
Merge pull request #1357 from owncloud/nsis_fixes
...
NSIS preparations for upgrade mode
2014-01-22 07:20:53 -08:00
Daniel Molkentin
8303c8f909
Mac OS Bundle file: bump copyright year
2014-01-21 11:23:46 +01:00
Klaas Freitag
05b81bc7d8
rename csync/doc to csync/csync_doc to satisfy cmake.
...
CMake throws a warning if there are two subdirs with the same name.
2014-01-20 16:19:30 +01:00
Olivier Goffart
316aade340
Merge branch 'csync_merge'
...
Conflicts:
src/CMakeLists.txt
2014-01-20 13:27:33 +01:00
Daniel Molkentin
28c4cd9caa
NSIS: Cleanup: Use MEMENTO defines where possible
2014-01-18 00:06:58 +01:00
Daniel Molkentin
2a0f28208c
NSIS: Don't install link to Desktop of a link by the same name already exists
...
Unfortunately, we cannot determine the target path for the .lnk file
without pulling in closed source plugins (or write our own), a length
I am not willing to go in the light of MSI.
Fixes #356
2014-01-18 00:01:44 +01:00
Daniel Molkentin
77610eb184
NSIS: Only remove sections that we actually installed
...
We can query the NSIS Memento extension for that.
2014-01-17 23:51:52 +01:00
Daniel Molkentin
4c7ddb769a
NSIS: INSTALL_PATH has never been used
...
Remove it to avoid confusion
2014-01-17 12:11:19 +01:00
