LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build system: add find_package for Qt

Browse source
This commit is contained in:
ws 2014-06-26 13:33:16 +02:00
parent 81b54969cc
commit b42d129364
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -41,7 +41,7 @@ include (GetCompilerVersion)
include (CreatePrecompiledHeader)
# for debugging the make system uncomment next line:
#set(CMAKE_VERBOSE_MAKEFILE ON)
# set(CMAKE_VERBOSE_MAKEFILE ON)
set(MSCORE_UNSTABLE TRUE) # mark as unstable
@ -108,8 +108,8 @@ else (APPLE)
set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
else (MINGW)
set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -fPIE -g")
set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -fPIE -g")
set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
endif (MINGW)
endif(APPLE)
@ -153,8 +153,7 @@ SET(QT_USE_QTWEBKIT TRUE)
SET(QT_USE_QTXMLPATTERNS TRUE)
SET(QT_USE_QTDECLARATIVE TRUE)
# find_package(Qt4 "4.8" REQUIRED QtCore QtGui QtXml QtSvg QtNetwork QtWebkit QtDeclarative)
# include(${QT_USE_FILE})
find_package(Qt5 COMPONENTS Widgets Xml Svg Network Designer WebKit Declarative)
##
@ -170,7 +169,7 @@ else (APPLE OR MINGW)
if (NOT ALSA_INCDIR)
message(FATAL_ERROR "Fatal error: ALSA >= 1.0.0 required")
else (NOT ALSA_INCDIR)
message("Alsa detected.")
message("Alsa found.")
set (USE_ALSA 1)
set (HAS_MIDI 1)
endif (NOT ALSA_INCDIR)
@ -365,7 +364,9 @@ if (MINGW)
else (MINGW)
set(BUILD_PCH true)
endif(MINGW)
precompiled_header(QT_INCLUDES all ${BUILD_PCH})
ADD_CUSTOM_TARGET(mops1 DEPENDS ${PROJECT_BINARY_DIR}/all.h)
ADD_CUSTOM_TARGET(mops2 DEPENDS ${PCH})
@ -381,7 +382,7 @@ if (APPLE AND CMAKE_BUILD_TYPE MATCHES "DEBUG")
#with xcode, we need to have all the targets in the same project
add_subdirectory(mtest)
else(APPLE AND CMAKE_BUILD_TYPE MATCHES "DEBUG")
add_subdirectory(mtest EXCLUDE_FROM_ALL)
add_subdirectory(mtest EXCLUDE_FROM_ALL)
endif(APPLE AND CMAKE_BUILD_TYPE MATCHES "DEBUG")
add_subdirectory(miditools EXCLUDE_FROM_ALL)

2
Makefile
View file

@ -28,7 +28,7 @@ VERSION = "2.0b-${REVISION}"
#
# change path to include your Qt5 installation
#
BINPATH = ${HOME}/Qt5.2.0/5.2.0-rc1/gcc_64/bin:${PATH}
BINPATH = ${HOME}/Qt5/5.3/gcc_64/bin:${PATH}
release:
if test ! -d build.release; then mkdir build.release; fi; \

14
build/CreatePrecompiledHeader.cmake
View file

@ -24,7 +24,7 @@ macro( precompiled_header includes header_name build_pch)
list( APPEND all_define_flags "-D${item}" )
endforeach()
list( APPEND compile_flags ${all_define_flags} )
list( APPEND compile_flags ${all_define_flags} )
# Prepare the compile flags var for passing to GCC
separate_arguments( compile_flags )
@ -43,20 +43,20 @@ macro( precompiled_header includes header_name build_pch)
)
else ( ${build_pch} )
message(STATUS "No precompiled header")
endif( ${build_pch} )
endif( ${build_pch} )
endif()
endmacro()
# Xcode PCH support. Has to be called *AFTER* the target is created.
# Xcode PCH support. Has to be called *AFTER* the target is created.
# "header_name" - the name of the PCH header, without the extension; "all" or something similar;
# note that the source file compiling the header needs to have the same name
# note that the source file compiling the header needs to have the same name
macro( xcode_pch target_name header_name )
if( APPLE )
if( APPLE )
set_target_properties(
${target_name}
${target_name}
PROPERTIES
XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${PROJECT_BINARY_DIR}/${header_name}.h"
XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES"
)
endif()
endmacro()
endmacro()