Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 11:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix link to QtWebKit lib to be fervor specific

Browse source
This commit is contained in:
Stephen Birarda 2013-07-31 12:04:47 -07:00
parent 0086dfdb26
commit 43fad3037f
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/CMakeLists.txt
View file

@ -3,8 +3,6 @@ cmake_minimum_required(VERSION 2.8)
set(ROOT_DIR ..)
set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH})
set(TARGET_NAME interface)
project(${TARGET_NAME})
@ -73,7 +71,6 @@ find_package(Qt5Core REQUIRED)
find_package(Qt5Gui REQUIRED)
find_package(Qt5Network REQUIRED)
find_package(Qt5OpenGL REQUIRED)
find_package(Qt5WebKit REQUIRED)
find_package(Qt5Svg REQUIRED)
set(QUAZIP_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/quazip)
@ -83,7 +80,7 @@ include_directories(external/fervor/)
# 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)
qt5_use_modules(${TARGET_NAME} Core Gui Network OpenGL Svg)
# link in the hifi shared library
include(${MACRO_DIR}/LinkHifiLibrary.cmake)

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

@ -1,7 +1,11 @@
cmake_minimum_required(VERSION 2.8)
project(Fervor)
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT_CMAKE_PREFIX_PATH})
find_package(Qt5Core REQUIRED)
find_package(Qt5Network REQUIRED)
find_package(Qt5WebKit REQUIRED)
find_package(Qt5Widgets REQUIRED)
add_definitions(-DFV_GUI)
@ -30,4 +34,4 @@ include_directories(
add_library(fervor ${FERVOR_SOURCES} ${FERVOR_HEADERS} ${FERVOR_MOC_SOURCES} ${FERVOR_WRAPPED_UI})
target_link_libraries(fervor ${QUAZIP_LIBRARIES})
qt5_use_modules(fervor Core Network Widgets)
qt5_use_modules(fervor Core Network Widgets WebKit)