From 43fad3037f6503e88c2e9933396aa880d8e169bf Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 31 Jul 2013 12:04:47 -0700 Subject: [PATCH] fix link to QtWebKit lib to be fervor specific --- interface/CMakeLists.txt | 5 +---- interface/external/fervor/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 635d20924b..e22ea6d628 100755 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -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) diff --git a/interface/external/fervor/CMakeLists.txt b/interface/external/fervor/CMakeLists.txt index 62968d8833..84d059b95c 100644 --- a/interface/external/fervor/CMakeLists.txt +++ b/interface/external/fervor/CMakeLists.txt @@ -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) \ No newline at end of file +qt5_use_modules(fervor Core Network Widgets WebKit) \ No newline at end of file