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

List:       kde-kimageshop
Subject:    =?utf-8?q?=5Bgraphics/krita=5D_3rdparty/ext=5Fqt=3A_Revert_=22Remove_BUILD=5FIN=5FSOURCE_option_for_
From:       L. E. Segovia <null () kde ! org>
Date:       2021-02-20 2:05:36
Message-ID: 20210220020536.3D0B61242138 () leptone ! kde ! org
[Download RAW message or body]

Git commit b797d94a69207ca8e250eb2569165ebddf0026f5 by L. E. Segovia.
Committed on 19/02/2021 at 22:44.
Pushed by lsegovia into branch 'master'.

Revert "Remove BUILD_IN_SOURCE option for Qt on non-windows systems as \
well"

My local logs show that compiling outside of source causes the
following:

duplicate symbol 'QMutexPrivate::wakeUp()' in:
    .obj/debug/qmutex.o
    .obj/debug/qmutex_mac.o
duplicate symbol 'QMutexPrivate::~QMutexPrivate()' in:
    .obj/debug/qmutex.o
    .obj/debug/qmutex_mac.o
duplicate symbol 'QMutexPrivate::QMutexPrivate()' in:
    .obj/debug/qmutex.o
    .obj/debug/qmutex_mac.o
duplicate symbol 'QMutexPrivate::~QMutexPrivate()' in:
    .obj/debug/qmutex.o
    .obj/debug/qmutex_mac.o
duplicate symbol 'QMutexPrivate::QMutexPrivate()' in:
    .obj/debug/qmutex.o
    .obj/debug/qmutex_mac.o
duplicate symbol 'QMutexPrivate::wait(int)' in:
    .obj/debug/qmutex.o
    .obj/debug/qmutex_mac.o
ld: 6 duplicate symbols for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see \
invocation) make[8]: *** [../../lib/QtCore.framework/QtCore_debug] Error 1
make[7]: *** [debug-all] Error 2

This reverts commit f8ae50561c18864fa69cd2eda7f41fcfa44695eb.

CCMAIL: kimageshop@kde.org

M  +4    -0    3rdparty/ext_qt/CMakeLists.txt

https://invent.kde.org/graphics/krita/commit/b797d94a69207ca8e250eb2569165ebddf0026f5


diff --git a/3rdparty/ext_qt/CMakeLists.txt \
b/3rdparty/ext_qt/CMakeLists.txt index 9cc1f63800..c97999146a 100644
--- a/3rdparty/ext_qt/CMakeLists.txt
+++ b/3rdparty/ext_qt/CMakeLists.txt
@@ -165,6 +165,7 @@ elseif (ANDROID)
       BUILD_COMMAND $(MAKE)
       INSTALL_COMMAND $(MAKE) install
       UPDATE_COMMAND ""
+      BUILD_IN_SOURCE 1
 )
 elseif (NOT APPLE)
   ExternalProject_Add(
@@ -194,6 +195,7 @@ elseif (NOT APPLE)
       BUILD_COMMAND $(MAKE)
       INSTALL_COMMAND $(MAKE) install
       UPDATE_COMMAND ""
+      BUILD_IN_SOURCE 1
   )
 else( APPLE )
 
@@ -347,6 +349,7 @@ else( APPLE )
         LOG_BUILD           ON
         LOG_TEST            ON
         LOG_INSTALL         ON
+        BUILD_IN_SOURCE     ON
 
         URL http://download.qt.io/official_releases/qt/5.12/5.12.10/single/qt-everywhere-src-5.12.10.tar.xz
  URL_MD5 a781a0e247400e764c0730b8fb54226f
@@ -365,5 +368,6 @@ else( APPLE )
         BUILD_COMMAND ${PARALLEL_MAKE}
         INSTALL_COMMAND make install
         UPDATE_COMMAND ""
+        BUILD_IN_SOURCE 1
       )
 endif()


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