switch to new qt5 find module setup

This commit is contained in:
Stephen Birarda 2013-07-23 20:49:08 -07:00
parent e4169665a9
commit a8afaea542
6 changed files with 12 additions and 6 deletions

View file

@ -8,7 +8,7 @@ MACRO(SETUP_HIFI_LIBRARY TARGET)
# create a library and set the property so it can be referenced later
add_library(${TARGET} ${LIB_SRCS})
find_package(Qt5 REQUIRED QtCore)
find_package(Qt5Core REQUIRED)
include(${QT_USE_FILE})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")

View file

@ -8,7 +8,7 @@ MACRO(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)
add_executable(${TARGET} ${TARGET_SRCS})
IF (${INCLUDE_QT})
find_package(Qt5 REQUIRED QtCore)
find_package(Qt5Core REQUIRED)
include(${QT_USE_FILE})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
ENDIF()

View file

@ -67,7 +67,13 @@ if (APPLE)
endif (APPLE)
find_package(Qt5 REQUIRED QtCore QtGui QtNetwork QtOpenGL QtWebKit QtSvg)
find_package(Qt5Core REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Network REQUIRED)
find_package(Qt5OpenGL REQUIRED)
find_package(Qt5WebKit REQUIRED)
find_package(Qt5Svg REQUIRED)
include(${QT_USE_FILE})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")

View file

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8)
project(Fervor)
find_package(Qt5 REQUIRED)
find_package(QtCore QtNetwork REQUIRED)
add_definitions(-DFV_GUI)

View file

@ -8,7 +8,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cm
set(TARGET_NAME avatars)
find_package(Qt5 REQUIRED QtCore)
find_package(Qt5Core)
include(${QT_USE_FILE})
qt5_wrap_cpp(WRAPPED_SRCS src/AvatarData.h)

View file

@ -6,7 +6,7 @@ set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
set(TARGET_NAME shared)
project(${TARGET_NAME})
find_package(Qt5 REQUIRED QtCore)
find_package(Qt5Core REQUIRED)
include(${QT_USE_FILE})
qt5_wrap_cpp(WRAPPED_SRCS src/NodeData.h)