Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-07 04:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

changes to CMakeLists for Qt5

Browse source
This commit is contained in:
Stephen Birarda 2013-07-24 11:29:12 -07:00
parent 7fde47655e
commit 9f2b2d09a9
9 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -2,6 +2,13 @@ cmake_minimum_required(VERSION 2.8)
project(hifi)
set(CMAKE_PREFIX_PATH "/usr/local/Cellar/qt5/5.1.0/lib/cmake")
# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
add_subdirectory(animation-server)
add_subdirectory(avatar-mixer)
add_subdirectory(audio-mixer)

3
cmake/macros/SetupHifiLibrary.cmake
View file

@ -9,8 +9,7 @@ MACRO(SETUP_HIFI_LIBRARY TARGET)
add_library(${TARGET} ${LIB_SRCS})
find_package(Qt5Core REQUIRED)
include(${QT_USE_FILE})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
qt5_use_modules(${TARGET} Core)
target_link_libraries(${TARGET} ${QT_LIBRARIES})
ENDMACRO(SETUP_HIFI_LIBRARY _target)

3
cmake/macros/SetupHifiProject.cmake
View file

@ -9,8 +9,7 @@ MACRO(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)
IF (${INCLUDE_QT})
find_package(Qt5Core REQUIRED)
include(${QT_USE_FILE})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${QT_QTGUI_INCLUDE_DIR}")
qt5_use_modules(${TARGET} Core)
ENDIF()
target_link_libraries(${TARGET} ${QT_LIBRARIES})

9
interface/CMakeLists.txt
View file

@ -74,20 +74,19 @@ 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}")
set(QUAZIP_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/quazip)
add_subdirectory(external/fervor/)
include_directories(external/fervor/)
# run qt moc on qt-enabled headers
qt5_wrap_cpp(INTERFACE_SRCS src/Application.h src/Webcam.h src/avatar/AvatarVoxelSystem.h
src/avatar/Face.h src/ui/BandwidthDialog.h src/ui/VoxelStatsDialog.h)
# qt5_wrap_cpp(INTERFACE_SRCS src/Application.h src/Webcam.h src/avatar/AvatarVoxelSystem.h
# src/avatar/Face.h src/ui/BandwidthDialog.h src/ui/VoxelStatsDialog.h)
# create the executable, make it a bundle on OS X
add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS})
qt5_use_modules(${TARGET_NAME} Core Gui Network OpenGL WebKit Svg)
# link in the hifi shared library
include(${MACRO_DIR}/LinkHifiLibrary.cmake)

11
interface/external/fervor/CMakeLists.txt vendored
View file

@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 2.8)
project(Fervor)
find_package(QtCore QtNetwork REQUIRED)
find_package(Qt5Core REQUIRED)
find_package(Qt5Network REQUIRED)
find_package(Qt5Widgets REQUIRED)
add_definitions(-DFV_GUI)
@ -13,9 +15,6 @@ list(REMOVE_ITEM FERVOR_HEADERS ${HEADER_PATH}/fvversioncomparator.h)
file(GLOB FERVOR_UI *.ui)
qt5_wrap_ui(FERVOR_WRAPPED_UI ${FERVOR_UI})
qt5_wrap_cpp(FERVOR_MOC_SOURCES ${FERVOR_HEADERS})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/")
find_package(Quazip REQUIRED)
@ -25,4 +24,6 @@ include_directories(
)
add_library(fervor ${FERVOR_SOURCES} ${FERVOR_HEADERS} ${FERVOR_MOC_SOURCES} ${FERVOR_WRAPPED_UI})
target_link_libraries(fervor ${QUAZIP_LIBRARIES})
target_link_libraries(fervor ${QUAZIP_LIBRARIES})
qt5_use_modules(fervor Core Network Widgets)

2
interface/external/fervor/fvplatform.h vendored
View file

@ -1,7 +1,7 @@
#ifndef FVPLATFORM_H
#define FVPLATFORM_H
#include <QObject>
#include <QtCore/QObject>
class FvPlatform : public QObject
{

4
libraries/avatars/CMakeLists.txt
View file

@ -9,12 +9,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cm
set(TARGET_NAME avatars)
find_package(Qt5Core)
include(${QT_USE_FILE})
qt5_wrap_cpp(WRAPPED_SRCS src/AvatarData.h)
include(${MACRO_DIR}/SetupHifiLibrary.cmake)
setup_hifi_library(${TARGET_NAME})
qt5_use_modules(${TARGET_NAME} Core)
include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} ${ROOT_DIR})

4
libraries/shared/CMakeLists.txt
View file

@ -7,12 +7,12 @@ set(TARGET_NAME shared)
project(${TARGET_NAME})
find_package(Qt5Core REQUIRED)
include(${QT_USE_FILE})
qt5_wrap_cpp(WRAPPED_SRCS src/NodeData.h)
include(${MACRO_DIR}/SetupHifiLibrary.cmake)
setup_hifi_library(${TARGET_NAME})
qt5_use_modules(${TARGET_NAME} Core)
set(EXTERNAL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
if (WIN32)

2
libraries/shared/src/NodeList.cpp
View file

@ -512,7 +512,7 @@ void NodeList::loadData(QSettings *settings) {
if (domainServerHostname.size() > 0) {
memset(_domainHostname, 0, MAX_HOSTNAME_BYTES);
memcpy(_domainHostname, domainServerHostname.toAscii().constData(), domainServerHostname.size());
memcpy(_domainHostname, domainServerHostname.toLocal8Bit().constData(), domainServerHostname.size());
}
settings->endGroup();