frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

merge upstream 

Former-commit-id: 041b6fab005766e1e5be56db2ce264c060504e47
This commit is contained in:
redpanther 2016-03-13 08:07:58 +01:00
parent c7df8c23c6
commit fd2cb44b1c
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hyperion-remote/CMakeLists.txt
View File

@ -2,15 +2,6 @@ cmake_minimum_required(VERSION 2.8)
project(hyperion-remote)
<<<<<<< HEAD
# find Qt4
if(ENABLE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
# set(CMAKE_CXX_FLAGS "-fPIC")
else(ENABLE_QT5)
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
=======
# find Qt
if(ENABLE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
@ -18,7 +9,6 @@ if(ENABLE_QT5)
# set(CMAKE_CXX_FLAGS "-fPIC")
else(ENABLE_QT5)
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
>>>>>>> upstream/master/master
endif(ENABLE_QT5)
# The following I do not undrstand completely...