[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/berger-scripting] /: Merge branch 'master' into berger-scripting
From:       Cyrille Berger <cberger () cberger ! net>
Date:       2016-09-29 19:28:04
Message-ID: E1bph00-0006X0-GQ () code ! kde ! org
[Download RAW message or body]

Git commit de6cedcb6fded58c97579f81402f68ae9d75a0b7 by Cyrille Berger.
Committed on 29/09/2016 at 18:00.
Pushed by berger into branch 'berger-scripting'.

Merge branch 'master' into berger-scripting

M  +20   -10   3rdparty/README.md
M  +8    -3    krita/krita.xmlgui
M  +21   -3    libs/ui/CMakeLists.txt
M  +35   -96   libs/ui/KisMainWindow.cpp
M  +1    -0    libs/ui/KisViewManager.cpp
M  +5    -0    libs/ui/KisViewManager.h
M  +1    -0    plugins/extensions/CMakeLists.txt
M  +1    -1    plugins/extensions/gmic/CMakeLists.txt

http://commits.kde.org/krita/de6cedcb6fded58c97579f81402f68ae9d75a0b7

diff --cc 3rdparty/README.md
index eda5beb,f59a6b6..c2ac369
--- a/3rdparty/README.md
+++ b/3rdparty/README.md
@@@ -78,9 -74,9 +76,11 @@@ Note: on all operating systems the enti
  
  Note that the cmake command needs to point to your BUILDROOT like /dev/d, not \
c:\dev\d.  
 +    set PATH=%BUILDROOT%\i\bin\;%BUILDROOT%\i\lib;%PATH%
 +    set PYTHONHOME=%BUILDROOT%/i (only if you want to build your own python)
-     cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=%BUILDROOT%/d \
-DINSTALL_ROOT=%BUILDROOT%/i -G "MinGW Makefiles" +     set \
PATH=BUILDROOT\i\bin\;BUILDROOT\i\lib;%PATH% +     cmake ..\krita\3rdparty \
-DEXTERNALS_DOWNLOAD_DIR=/dev/d -DINSTALL_ROOT=/dev/i  -G "MinGW Makefiles" + 
  3. build the packages:
  
  With a judicious application of DEPENDS statements, it's possible to build it all \
in one go, but in my experience that fails always, so it's better to build the \
dependencies independently.


[prev in list] [next in list] [prev in thread] [next in thread]