Attachment #558452 for bug #673342

View | Details | Raw Unified | Return to bug 673342
Collapse All | Expand All




      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,

             set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
         endif (NOT BUILD_64)
      else (MINGW)
         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 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.

    #     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"
    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

Lines 43-49 if (NOT MSVC) Link Here

(-)a/aeolus/CMakeLists.txt (-1 / +1 lines)
43	set_target_properties (	43	set_target_properties (
44	aeolus	44	aeolus
45	PROPERTIES	45	PROPERTIES
46	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	46	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
47	)	47	)
48	else (NOT MSVC)	48	else (NOT MSVC)
49	set_target_properties (	49	set_target_properties (

Lines 34-40 if (NOT MSVC) Link Here

(-)a/audiofile/CMakeLists.txt (-1 / +1 lines)
34	set_target_properties (	34	set_target_properties (
35	audiofile	35	audiofile
36	PROPERTIES	36	PROPERTIES
37	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	37	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
38	)	38	)
39	else (NOT MSVC)	39	else (NOT MSVC)
40	set_target_properties (	40	set_target_properties (

Lines 51-57 if (NOT MSVC) Link Here

(-)a/awl/CMakeLists.txt (-1 / +1 lines)
51	set_target_properties (	51	set_target_properties (
52	awl	52	awl
53	PROPERTIES	53	PROPERTIES
54	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	54	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
55	)	55	)
56	else (NOT MSVC)	56	else (NOT MSVC)
57	set_target_properties (	57	set_target_properties (

Lines 44-50 macro( precompiled_header includes header_name build_pch) Link Here

(-)a/build/CreatePrecompiledHeader.cmake (-2 / +2 lines)
44	set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)	44	set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
45	add_custom_command(	45	add_custom_command(
46	OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch	46	OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
47	COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h	47	COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -fPIC ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
48	DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h	48	DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
49	WORKING_DIRECTORY ${PROJECT_BINARY_DIR}	49	WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
50	VERBATIM	50	VERBATIM
Lines 123-126 macro( vstudio_pch target_name ) Link Here
123	COMPILE_FLAGS "/Yc"	123	COMPILE_FLAGS "/Yc"
124	)	124	)
125	endif( MSVC )	125	endif( MSVC )
126	endmacro()	126	endmacro()

Lines 55-61 if (NOT MINGW AND NOT APPLE AND NOT MSVC) Link Here

(-)a/bww2mxml/CMakeLists.txt (-1 / +1 lines)
55	set_target_properties (	55	set_target_properties (
56	bww2mxml	56	bww2mxml
57	PROPERTIES	57	PROPERTIES
58	COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"	58	COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -fPIC -Wall -Wextra -Winvalid-pch"
59	)	59	)
60		60
61	target_link_libraries(bww2mxml	61	target_link_libraries(bww2mxml

Lines 52-58 if (NOT MSVC) Link Here

(-)a/effects/CMakeLists.txt (-1 / +1 lines)
52	set_target_properties (	52	set_target_properties (
53	effects	53	effects
54	PROPERTIES	54	PROPERTIES
55	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	55	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
56	)	56	)
57	else (NOT MSVC)	57	else (NOT MSVC)
58	set_target_properties (	58	set_target_properties (

Lines 52-58 if (NOT MSVC) Link Here

(-)a/fluid/CMakeLists.txt (-1 / +1 lines)
52	set_target_properties (	52	set_target_properties (
53	fluid	53	fluid
54	PROPERTIES	54	PROPERTIES
55	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	55	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
56	)	56	)
57	else (NOT MSVC)	57	else (NOT MSVC)
58	set_target_properties (	58	set_target_properties (

Lines 20-26 add_executable( Link Here

(-)a/fonttools/CMakeLists.txt (-1 / +1 lines)
20	target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)	20	target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
21		21
22	if (NOT MSVC)	22	if (NOT MSVC)
23	set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")	23	set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -fPIC -Wall -Wextra -Winvalid-pch")
24	else (NOT MSVC)	24	else (NOT MSVC)
25	set_target_properties (	25	set_target_properties (
26	genft	26	genft

Lines 124-130 if (NOT MSVC) Link Here

(-)a/libmscore/CMakeLists.txt (-1 / +1 lines)
124	set_target_properties (	124	set_target_properties (
125	libmscore	125	libmscore
126	PROPERTIES	126	PROPERTIES
127	COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual ${COVERAGE_OPTIONS}"	127	COMPILE_FLAGS "-fPIC ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual ${COVERAGE_OPTIONS}"
128	)	128	)
129	else (NOT MSVC)	129	else (NOT MSVC)
130	set_target_properties (	130	set_target_properties (




set_target_properties (
      genManual
      PROPERTIES
      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}\\\" -fPIC -Wall -Wextra"
         )
   else (NOT MSVC)
      set_target_properties (

Lines 35-41 if (NOT MSVC) Link Here

(-)a/midi/CMakeLists.txt (-1 / +1 lines)
35	set_target_properties (	35	set_target_properties (
36	midi	36	midi
37	PROPERTIES	37	PROPERTIES
38	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	38	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
39	)	39	)
40	else (NOT MSVC)	40	else (NOT MSVC)
41	set_target_properties (	41	set_target_properties (

Lines 14-20 add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp) Link Here

(-)a/miditools/CMakeLists.txt (-2 / +2 lines)
14		14
15	if (NOT MSVC)	15	if (NOT MSVC)
16	set_target_properties(smf2xml	16	set_target_properties(smf2xml
17	PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"	17	PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
18	)	18	)
19	else (NOT MSVC)	19	else (NOT MSVC)
20	set_target_properties (smf2xml	20	set_target_properties (smf2xml
Lines 31-37 add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp) Link Here
31	if (NOT MSVC)	31	if (NOT MSVC)
32	set_target_properties (	32	set_target_properties (
33	xml2smf	33	xml2smf
34	PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"	34	PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
35	)	35	)
36	else (NOT MSVC)	36	else (NOT MSVC)
37	set_target_properties (	37	set_target_properties (

Lines 546-552 if (MINGW) Link Here

(-)a/mscore/CMakeLists.txt (-2 / +2 lines)
546	if(CMAKE_BUILD_TYPE MATCHES "DEBUG")	546	if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
547	set_target_properties( mscore	547	set_target_properties( mscore
548	PROPERTIES	548	PROPERTIES
549	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"	549	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
550	LINK_FLAGS "-mwindows -mconsole -L ${QT_INSTALL_LIBS}"	550	LINK_FLAGS "-mwindows -mconsole -L ${QT_INSTALL_LIBS}"
551	)	551	)
552	else(CMAKE_BUILD_TYPE MATCHES "DEBUG")	552	else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
Lines 710-716 else (MINGW) Link Here
710	set_target_properties (	710	set_target_properties (
711	mscore	711	mscore
712	PROPERTIES	712	PROPERTIES
713	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"	713	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wno-overloaded-virtual -Winvalid-pch"
714	)	714	)
715		715
716	if (OMR)	716	if (OMR)

Lines 141-147 if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) Link Here

(-)a/mtest/CMakeLists.txt (-2 / +2 lines)
141	set_target_properties (	141	set_target_properties (
142	testutils	142	testutils
143	PROPERTIES	143	PROPERTIES
144	COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"	144	COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
145	)	145	)
146	else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))	146	else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
147	if (MSVC)	147	if (MSVC)
Lines 154-160 else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) Link Here
154	set_target_properties (	154	set_target_properties (
155	testutils	155	testutils
156	PROPERTIES	156	PROPERTIES
157	COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"	157	COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
158	)	158	)
159	endif (MSVC)	159	endif (MSVC)
160	endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))	160	endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))




      ${TARGET}
      PROPERTIES
      AUTOMOC true
      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}\\\" -fPIC -Wall -Wextra"
      LINK_FLAGS    ""
      )
endif(APPLE)


set_target_properties (
      ${TARGET}
      PROPERTIES
      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"))


Lines 48-54 if (NOT MSVC) Link Here

(-)a/omr/CMakeLists.txt (-1 / +1 lines)
48	set_target_properties (	48	set_target_properties (
49	omr	49	omr
50	PROPERTIES	50	PROPERTIES
51	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"	51	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
52	)	52	)
53	else (NOT MSVC)	53	else (NOT MSVC)
54	set_target_properties (	54	set_target_properties (

Lines 36-42 if (NOT MSVC) Link Here

(-)a/synthesizer/CMakeLists.txt (-1 / +1 lines)
36	set_target_properties (	36	set_target_properties (
37	synthesizer	37	synthesizer
38	PROPERTIES	38	PROPERTIES
39	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	39	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
40	)	40	)
41	else (NOT MSVC)	41	else (NOT MSVC)
42	set_target_properties (	42	set_target_properties (

Lines 15-21 add_library ( Link Here

(-)a/thirdparty/beatroot/CMakeLists.txt (-1 / +1 lines)
15	if (NOT MSVC)	15	if (NOT MSVC)
16	set_target_properties( beatroot	16	set_target_properties( beatroot
17	PROPERTIES	17	PROPERTIES
18	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	18	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
19	)	19	)
20	else (NOT MSVC)	20	else (NOT MSVC)
21	set_target_properties ( beatroot	21	set_target_properties ( beatroot

Lines 46-52 if (NOT MSVC) Link Here

(-)a/thirdparty/kQOAuth/CMakeLists.txt (-1 / +1 lines)
46	set_target_properties (	46	set_target_properties (
47	kqoauth	47	kqoauth
48	PROPERTIES	48	PROPERTIES
49	COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"	49	COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -fPIC -Wall -Wextra -Winvalid-pch"
50	)	50	)
51	else (NOT MSVC)	51	else (NOT MSVC)
52	set_target_properties (	52	set_target_properties (

Lines 42-48 if (NOT MSVC) Link Here

(-)a/thirdparty/ofqf/CMakeLists.txt (-1 / +1 lines)
42	set_target_properties (	42	set_target_properties (
43	ofqf	43	ofqf
44	PROPERTIES	44	PROPERTIES
45	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	45	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
46	)	46	)
47	else (NOT MSVC)	47	else (NOT MSVC)
48	set_target_properties (	48	set_target_properties (

Lines 35-41 if (NOT MSVC) Link Here

(-)a/thirdparty/qzip/CMakeLists.txt (-1 / +1 lines)
35	set_target_properties (	35	set_target_properties (
36	qzip	36	qzip
37	PROPERTIES	37	PROPERTIES
38	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	38	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
39	)	39	)
40	else (NOT MSVC)	40	else (NOT MSVC)
41	set_target_properties (	41	set_target_properties (

Lines 43-49 add_library ( Link Here

(-)a/thirdparty/rtf2html/CMakeLists.txt (-1 / +1 lines)
43	if (NOT MSVC)	43	if (NOT MSVC)
44	set_target_properties( rtf2html	44	set_target_properties( rtf2html
45	PROPERTIES	45	PROPERTIES
46	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	46	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
47	)	47	)
48	else (NOT MSVC)	48	else (NOT MSVC)
49	set_target_properties ( rtf2html	49	set_target_properties ( rtf2html

Lines 37-43 if (NOT MSVC) Link Here

(-)a/thirdparty/singleapp/src/CMakeLists.txt (-1 / +1 lines)
37	set_target_properties (	37	set_target_properties (
38	qtsingleapp	38	qtsingleapp
39	PROPERTIES	39	PROPERTIES
40	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	40	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
41	)	41	)
42	else (NOT MSVC)	42	else (NOT MSVC)
43	set_target_properties (	43	set_target_properties (

Lines 39-45 if (NOT MSVC) Link Here

(-)a/zerberus/CMakeLists.txt (-3 / +1 lines)
39	set_target_properties (	39	set_target_properties (
40	zerberus	40	zerberus
41	PROPERTIES	41	PROPERTIES
42	COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"	42	COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
43	)	43	)
44	else (NOT MSVC)	44	else (NOT MSVC)
45	set_target_properties (	45	set_target_properties (
46	-
47	--
48	thirdparty/poppler/CMakeLists.txt \| 8 ++++----	46	thirdparty/poppler/CMakeLists.txt \| 8 ++++----
49	1 file changed, 4 insertions(+), 4 deletions(-)	47	1 file changed, 4 insertions(+), 4 deletions(-)




   )

if (APPLE)
   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 -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 -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 -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
- 

Return to bug 673342

Lines 206-216 if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") Link Here

(-)a/CMakeLists.txt (-10 / +6 lines)
206	endif()	206	endif()
207	endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")	207	endif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
208		208
209	if (NOT MSVC)
210	set(CMAKE_CXX_FLAGS_DEBUG "-g")
211	set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
212	endif (NOT MSVC)
213
214	if (APPLE)	209	if (APPLE)
215	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ -Wno-inconsistent-missing-override")	210	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ -Wno-inconsistent-missing-override")
216	# This is necessary for genManual to be executed during the build phase,	211	# This is necessary for genManual to be executed during the build phase,
Lines 241-255 else (APPLE) Link Here
241	set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")	236	set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
242	endif (NOT BUILD_64)	237	endif (NOT BUILD_64)
243	else (MINGW)	238	else (MINGW)
244	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")	239	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
245	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Woverloaded-virtual")	240	set(CMAKE_CXX_STANDARD 11)
246	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG_OUTPUT")	241	set(CMAKE_CXX_STANDARD_REQUIRED ON)
		242	set(CMAKE_CXX_EXTENSIONS ON)
247	endif (MINGW)	243	endif (MINGW)
248	endif (MSVC)	244	endif (MSVC)
249	endif(APPLE)	245	endif(APPLE)
250		246
251	set(CMAKE_INCLUDE_CURRENT_DIR TRUE)	247	set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
252	set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)	248	set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
253	set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)	249	set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
254		250
255	# The MuseScore version number.	251	# The MuseScore version number.
Lines 615-621 if (NOT MINGW AND NOT MSVC AND NOT APPLE) Link Here
615	# set library search path for runtime linker to load the same	611	# set library search path for runtime linker to load the same
616	# qt libraries as we used at compile time	612	# qt libraries as we used at compile time
617	#	613	#
618	SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # Ignored if CMAKE_SKIP_RPATH="TRUE"	614	# SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # Ignored if CMAKE_SKIP_RPATH="TRUE"
619	string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention	615	string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
620	if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match	616	if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
621	# Build portable AppImage as per https://github.com/probonopd/AppImageKit	617	# Build portable AppImage as per https://github.com/probonopd/AppImageKit

Lines 37-50 if(APPLE) Link Here

(-)a/manual/CMakeLists.txt (-2 / +2 lines)
37	set_target_properties (	37	set_target_properties (
38	genManual	38	genManual
39	PROPERTIES	39	PROPERTIES
40	COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"	40	COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
41	)	41	)
42	else(APPLE)	42	else(APPLE)
43	if (NOT MSVC)	43	if (NOT MSVC)
44	set_target_properties (	44	set_target_properties (
45	genManual	45	genManual
46	PROPERTIES	46	PROPERTIES
47	COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"	47	COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
48	)	48	)
49	else (NOT MSVC)	49	else (NOT MSVC)
50	set_target_properties (	50	set_target_properties (

Lines 59-74 set_target_properties ( Link Here

(-)a/mtest/cmake.inc (-5 / +5 lines)
59	${TARGET}	59	${TARGET}
60	PROPERTIES	60	PROPERTIES
61	AUTOMOC true	61	AUTOMOC true
62	COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"	62	COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
63	LINK_FLAGS "-g -stdlib=libc++"	63	LINK_FLAGS "-stdlib=libc++"
64	)	64	)
65	else(APPLE)	65	else(APPLE)
66	set_target_properties (	66	set_target_properties (
67	${TARGET}	67	${TARGET}
68	PROPERTIES	68	PROPERTIES
69	AUTOMOC true	69	AUTOMOC true
70	COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"	70	COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
71	LINK_FLAGS "-g"	71	LINK_FLAGS ""
72	)	72	)
73	endif(APPLE)	73	endif(APPLE)
74		74
Lines 76-82 if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0")) Link Here
76	set_target_properties (	76	set_target_properties (
77	${TARGET}	77	${TARGET}
78	PROPERTIES	78	PROPERTIES
79	COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"	79	COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
80	)	80	)
81	endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))	81	endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
82		82

Lines 134-150 add_library(poppler STATIC Link Here

(-)a/thirdparty/poppler/CMakeLists.txt (-5 / +4 lines)
134	)	134	)
135		135
136	if (APPLE)	136	if (APPLE)
137	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")	137	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")
138	else (APPLE)	138	else (APPLE)
139	if (MINGW)	139	if (MINGW)
140	if (BUILD_64)	140	if (BUILD_64)
141	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")	141	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")
142	else (BUILD_64)	142	else (BUILD_64)
143	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")	143	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")
144	endif (BUILD_64)	144	endif (BUILD_64)
145	else (MINGW)	145	else (MINGW)
146	if (NOT MSVC)	146	if (NOT MSVC)
147	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")	147	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")
148	else (NOT MSVC)	148	else (NOT MSVC)
149	# For MSVC:	149	# For MSVC:
150	# -O2: controls optimization, not compatible with global options	150	# -O2: controls optimization, not compatible with global options
151	-