Attachment 558452 Details for Bug 673342 – musescore-3.0_rc-cmake.patch

[patch] musescore-3.0_rc-cmake.patch

musescore-3.0_rc-cmake.patch (text/plain), 20.86 KB, created by Andreas Sturmlechner on 2018-12-24 20:06:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Sturmlechner

Created: 2018-12-24 20:06:49 UTC

Size: 20.86 KB

patch

obsolete

>From 7bebf069ac2dfd1a6527d3fe9d10a9ea50b1c778 Mon Sep 17 00:00:00 2001
>From: Andreas Sturmlechner <asturm@gentoo.org>
>Date: Mon, 24 Dec 2018 04:17:50 +0100
>Subject: [PATCH 1/2] Rebase Gentoo build system patch on top of 3.0_rc
>
>---
> CMakeLists.txt                          | 16 ++++++----------
> aeolus/CMakeLists.txt                   |  2 +-
> audiofile/CMakeLists.txt                |  2 +-
> awl/CMakeLists.txt                      |  2 +-
> build/CreatePrecompiledHeader.cmake     |  4 ++--
> bww2mxml/CMakeLists.txt                 |  2 +-
> effects/CMakeLists.txt                  |  2 +-
> fluid/CMakeLists.txt                    |  2 +-
> fonttools/CMakeLists.txt                |  2 +-
> libmscore/CMakeLists.txt                |  2 +-
> manual/CMakeLists.txt                   |  4 ++--
> midi/CMakeLists.txt                     |  2 +-
> miditools/CMakeLists.txt                |  4 ++--
> mscore/CMakeLists.txt                   |  4 ++--
> mtest/CMakeLists.txt                    |  4 ++--
> mtest/cmake.inc                         | 10 +++++-----
> omr/CMakeLists.txt                      |  2 +-
> synthesizer/CMakeLists.txt              |  2 +-
> thirdparty/beatroot/CMakeLists.txt      |  2 +-
> thirdparty/kQOAuth/CMakeLists.txt       |  2 +-
> thirdparty/ofqf/CMakeLists.txt          |  2 +-
> thirdparty/qzip/CMakeLists.txt          |  2 +-
> thirdparty/rtf2html/CMakeLists.txt      |  2 +-
> thirdparty/singleapp/src/CMakeLists.txt |  2 +-
> zerberus/CMakeLists.txt                 |  2 +-
> 25 files changed, 39 insertions(+), 43 deletions(-)
>
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 61a0e5cb2..e579268a4 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -206,11 +206,6 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
>       endif()
> endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
> 
>-if (NOT MSVC)
>-   set(CMAKE_CXX_FLAGS_DEBUG   "-g")
>-   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
>-endif (NOT MSVC)
>-
> if (APPLE)
>    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ -Wno-inconsistent-missing-override")
>    # This is necessary for genManual to be executed during the build phase,
>@@ -241,15 +236,16 @@ else (APPLE)
>              set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
>          endif (NOT BUILD_64)
>       else (MINGW)
>-         set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} -fPIC")
>-         set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Woverloaded-virtual")
>-         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG_OUTPUT")
>+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
>+         set(CMAKE_CXX_STANDARD 11)
>+         set(CMAKE_CXX_STANDARD_REQUIRED ON)
>+         set(CMAKE_CXX_EXTENSIONS ON)
>       endif (MINGW)
>    endif (MSVC)
> endif(APPLE)
> 
> set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
>-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
>+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
> set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
> 
> # The MuseScore version number.
>@@ -615,7 +611,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
>     #     set library search path for runtime linker to load the same
>     #     qt libraries as we used at compile time
>     #
>-    SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # Ignored if CMAKE_SKIP_RPATH="TRUE"
>+    # SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # Ignored if CMAKE_SKIP_RPATH="TRUE"
>     string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
>     if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
>       # Build portable AppImage as per https://github.com/probonopd/AppImageKit
>diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
>index b3862ee9d..38d1cee99 100644
>--- a/aeolus/CMakeLists.txt
>+++ b/aeolus/CMakeLists.txt
>@@ -43,7 +43,7 @@ if (NOT MSVC)
>    set_target_properties (
>       aeolus
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
>index 030981bcb..357d4eecd 100644
>--- a/audiofile/CMakeLists.txt
>+++ b/audiofile/CMakeLists.txt
>@@ -34,7 +34,7 @@ if (NOT MSVC)
>    set_target_properties (
>       audiofile
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
>index dbad12c46..4893eeca5 100644
>--- a/awl/CMakeLists.txt
>+++ b/awl/CMakeLists.txt
>@@ -51,7 +51,7 @@ if (NOT MSVC)
>    set_target_properties (
>       awl
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
>index 612437714..8965b760c 100644
>--- a/build/CreatePrecompiledHeader.cmake
>+++ b/build/CreatePrecompiledHeader.cmake
>@@ -44,7 +44,7 @@ macro( precompiled_header includes header_name build_pch)
>                set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
>                add_custom_command(
>                   OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
>-                  COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
>+                  COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -fPIC ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
>                   DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
>                   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
>                   VERBATIM
>@@ -123,4 +123,4 @@ macro( vstudio_pch target_name )
>                COMPILE_FLAGS "/Yc"
>             ) 
>     endif( MSVC )
>-endmacro()
>\ No newline at end of file
>+endmacro()
>diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
>index be9effa31..c2c6b71a9 100644
>--- a/bww2mxml/CMakeLists.txt
>+++ b/bww2mxml/CMakeLists.txt
>@@ -55,7 +55,7 @@ if (NOT MINGW AND NOT APPLE AND NOT MSVC)
>    set_target_properties (
>          bww2mxml
>          PROPERTIES
>-            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
>+            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -fPIC -Wall -Wextra -Winvalid-pch"
>          )
> 
>    target_link_libraries(bww2mxml
>diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
>index 32e65fbce..a19d3a93f 100644
>--- a/effects/CMakeLists.txt
>+++ b/effects/CMakeLists.txt
>@@ -52,7 +52,7 @@ if (NOT MSVC)
>    set_target_properties (
>       effects
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
>index 9c6eecbfa..9a7a96f46 100644
>--- a/fluid/CMakeLists.txt
>+++ b/fluid/CMakeLists.txt
>@@ -52,7 +52,7 @@ if (NOT MSVC)
>    set_target_properties (
>       fluid
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
>index c123b5dbf..88f9a8d75 100644
>--- a/fonttools/CMakeLists.txt
>+++ b/fonttools/CMakeLists.txt
>@@ -20,7 +20,7 @@ add_executable(
> target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
> 
> if (NOT MSVC)
>-   set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
>+   set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -fPIC -Wall -Wextra -Winvalid-pch")
> else (NOT MSVC)
>    set_target_properties (
>       genft
>diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
>index 06d98c036..1b7f3d268 100644
>--- a/libmscore/CMakeLists.txt
>+++ b/libmscore/CMakeLists.txt
>@@ -124,7 +124,7 @@ if (NOT MSVC)
>    set_target_properties (
>       libmscore
>       PROPERTIES
>-         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual ${COVERAGE_OPTIONS}"
>+         COMPILE_FLAGS "-fPIC ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual ${COVERAGE_OPTIONS}"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
>index b09d2b53a..c011b8b83 100644
>--- a/manual/CMakeLists.txt
>+++ b/manual/CMakeLists.txt
>@@ -37,14 +37,14 @@ if(APPLE)
> set_target_properties (
>       genManual
>       PROPERTIES
>-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
>+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
>       )
> else(APPLE)
>    if (NOT MSVC)
>       set_target_properties (
>          genManual
>          PROPERTIES
>-         COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
>+         COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
>          )
>    else (NOT MSVC)
>       set_target_properties (
>diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
>index bb27b5c73..7d82b14ba 100644
>--- a/midi/CMakeLists.txt
>+++ b/midi/CMakeLists.txt
>@@ -35,7 +35,7 @@ if (NOT MSVC)
>    set_target_properties (
>       midi
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
>index aef422735..10ff7d929 100644
>--- a/miditools/CMakeLists.txt
>+++ b/miditools/CMakeLists.txt
>@@ -14,7 +14,7 @@ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
> 
> if (NOT MSVC)
>    set_target_properties(smf2xml
>-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
>+      PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
>       )
> else (NOT MSVC)
>    set_target_properties (smf2xml
>@@ -31,7 +31,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
> if (NOT MSVC)
>    set_target_properties (
>       xml2smf
>-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
>+      PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
>index ed6c17f5e..d3b2e807f 100644
>--- a/mscore/CMakeLists.txt
>+++ b/mscore/CMakeLists.txt
>@@ -546,7 +546,7 @@ if (MINGW)
>    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
>      set_target_properties( mscore
>         PROPERTIES
>-           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
>+           COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
>            LINK_FLAGS "-mwindows -mconsole -L ${QT_INSTALL_LIBS}"
>         )
>    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
>@@ -710,7 +710,7 @@ else (MINGW)
>       set_target_properties (
>          mscore
>          PROPERTIES
>-            COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
>+            COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wno-overloaded-virtual -Winvalid-pch"
>          )
> 
>       if (OMR)
>diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
>index 99a4f9d3f..63d7bd4cb 100644
>--- a/mtest/CMakeLists.txt
>+++ b/mtest/CMakeLists.txt
>@@ -141,7 +141,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
> 	set_target_properties (
> 		  testutils
> 		  PROPERTIES
>-		  COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
>+		  COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
> 		  )
> else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
> 	if (MSVC)
>@@ -154,7 +154,7 @@ else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
> 		set_target_properties (
> 		  testutils
> 		  PROPERTIES
>-		  COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
>+		  COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
> 		  )
> 	endif (MSVC)
> endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
>diff --git a/mtest/cmake.inc b/mtest/cmake.inc
>index f8e72bcb5..3c491be53 100644
>--- a/mtest/cmake.inc
>+++ b/mtest/cmake.inc
>@@ -59,16 +59,16 @@ set_target_properties (
>       ${TARGET}
>       PROPERTIES
>       AUTOMOC true
>-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
>-      LINK_FLAGS    "-g -stdlib=libc++"
>+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
>+      LINK_FLAGS    "-stdlib=libc++"
>       )
> else(APPLE)
> set_target_properties (
>       ${TARGET}
>       PROPERTIES
>       AUTOMOC true
>-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
>-      LINK_FLAGS    "-g"
>+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
>+      LINK_FLAGS    ""
>       )
> endif(APPLE)
> 
>@@ -76,7 +76,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
> set_target_properties (
>       ${TARGET}
>       PROPERTIES
>-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
>+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
>       )
> endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
> 
>diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
>index 2b8e38e91..4844115b0 100644
>--- a/omr/CMakeLists.txt
>+++ b/omr/CMakeLists.txt
>@@ -48,7 +48,7 @@ if (NOT MSVC)
>    set_target_properties (
>       omr
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
>index 60e775df8..191c66dfe 100644
>--- a/synthesizer/CMakeLists.txt
>+++ b/synthesizer/CMakeLists.txt
>@@ -36,7 +36,7 @@ if (NOT MSVC)
>    set_target_properties (
>       synthesizer
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
>index 89a939f9e..c5721507f 100644
>--- a/thirdparty/beatroot/CMakeLists.txt
>+++ b/thirdparty/beatroot/CMakeLists.txt
>@@ -15,7 +15,7 @@ add_library (
> if (NOT MSVC)
>    set_target_properties( beatroot
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties ( beatroot
>diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
>index c95f93e73..7fc9e2a86 100644
>--- a/thirdparty/kQOAuth/CMakeLists.txt
>+++ b/thirdparty/kQOAuth/CMakeLists.txt
>@@ -46,7 +46,7 @@ if (NOT MSVC)
>    set_target_properties (
>       kqoauth
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
>index a63732bb8..fa59c09cb 100644
>--- a/thirdparty/ofqf/CMakeLists.txt
>+++ b/thirdparty/ofqf/CMakeLists.txt
>@@ -42,7 +42,7 @@ if (NOT MSVC)
>    set_target_properties (
>       ofqf
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
>index ef29319c0..a2df38eeb 100644
>--- a/thirdparty/qzip/CMakeLists.txt
>+++ b/thirdparty/qzip/CMakeLists.txt
>@@ -35,7 +35,7 @@ if (NOT MSVC)
>    set_target_properties (
>       qzip
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
>index bfb3ac622..67bab34cc 100644
>--- a/thirdparty/rtf2html/CMakeLists.txt
>+++ b/thirdparty/rtf2html/CMakeLists.txt
>@@ -43,7 +43,7 @@ add_library (
> if (NOT MSVC)
>    set_target_properties( rtf2html
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties ( rtf2html
>diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
>index 9ce383752..e92682606 100644
>--- a/thirdparty/singleapp/src/CMakeLists.txt
>+++ b/thirdparty/singleapp/src/CMakeLists.txt
>@@ -37,7 +37,7 @@ if (NOT MSVC)
>    set_target_properties (
>       qtsingleapp
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
>index ac42a7c75..4cde7ab22 100644
>--- a/zerberus/CMakeLists.txt
>+++ b/zerberus/CMakeLists.txt
>@@ -39,7 +39,7 @@ if (NOT MSVC)
>    set_target_properties (
>       zerberus
>       PROPERTIES
>-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
>+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
>       )
> else (NOT MSVC)
>    set_target_properties (
>-- 
>2.20.1
>
>
>From f68d6e197def8e457fb14409206b53832fe623b6 Mon Sep 17 00:00:00 2001
>From: Andreas Sturmlechner <asturm@gentoo.org>
>Date: Mon, 24 Dec 2018 04:21:40 +0100
>Subject: [PATCH 2/2] Fix bundled poppler build...
>
>---
> thirdparty/poppler/CMakeLists.txt | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/thirdparty/poppler/CMakeLists.txt b/thirdparty/poppler/CMakeLists.txt
>index a22722ab3..bc3e85f0d 100644
>--- a/thirdparty/poppler/CMakeLists.txt
>+++ b/thirdparty/poppler/CMakeLists.txt
>@@ -134,17 +134,17 @@ add_library(poppler STATIC
>    )
> 
> if (APPLE)
>-   set ( POPPLER_COMPILE_FLAGS "-O2 -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
>+   set ( POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
> else (APPLE)
>    if (MINGW)
>        if (BUILD_64)
>-          set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -Wno-shift-negative-value -Wno-stringop-overflow -std=c++11")
>+          set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -Wno-shift-negative-value -Wno-stringop-overflow -std=c++11")
>        else (BUILD_64)
>-          set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
>+          set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
>        endif (BUILD_64)
>    else (MINGW)
>       if (NOT MSVC)
>-         set (POPPLER_COMPILE_FLAGS "-O2 -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
>+         set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
>       else (NOT MSVC)
>          # For MSVC:
>          # -O2: controls optimization, not compatible with global options
>-- 
>2.20.1
>

Actions: View | Diff

Attachments on bug 673342: 558010 | 558452