Commit efaba0d3 authored by Matthias Möller's avatar Matthias Möller

- remove automoc

- better error messages
- remove cmake policy warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17594 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 04b8c38d
cmake_minimum_required (VERSION 2.8.4)
cmake_policy(SET CMP0020 NEW)
if (NOT CMAKE_BUILD_TYPE)
message(STATUS "No build type selected, default to Release")
......
......@@ -81,7 +81,6 @@ acg_drop_templates (sources)
# genereate uic and moc targets
if (QT5_FOUND)
set(CMAKE_AUTOMOC ON)
acg_qt5_autouic (uic_targets ${ui})
acg_qt5_automoc (moc_targets ${headers})
else ()
......
......@@ -212,12 +212,23 @@ macro (acg_qt5)
#set (QT_MIN_VERSION ${ARGN})
#for custom installation of qt5, dont use any of these variables
set (QT5_INSTALL_PATH "" CACHE PATH "Path to qt5 directory which contains lib and include folder")
set (QT5_INSTALL_PATH "" CACHE PATH "Path to Qt5 directory which contains lib and include folder")
if (EXISTS ${QT5_INSTALL_PATH})
if (NOT EXISTS "${QT5_INSTALL_PATH}/include")
message( FATAL_ERROR "Could not find Qt5 include directory. Please set QT5_INSTALL_PATH to the directory which contains Qt5 lib and include folder.")
endif()
if (NOT EXISTS "${QT5_INSTALL_PATH}/lib")
message( FATAL_ERROR "Could not find Qt5 lib directory. Please set QT5_INSTALL_PATH to the directory which contains Qt5 lib and include folder.")
endif()
else()
message( FATAL_ERROR "The Given QT5_INSTALL_PATH does not exists")
endif()
set (CMAKE_PREFIX_PATH ${QT5_INSTALL_PATH})
set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set (QT_PLUGINS_DIR "${QT5_INSTALL_PATH}/plugins" CACHE PATH "")
set (QT_RCC_EXECUTABLE "${QT5_INSTALL_PATH}/bin/rcc" CACHE PATH "Path to the rcc executable")
#glu32.lib is needed by qt5 opengl version. it cannot find it by itself so we help qt
if ( WIN32 )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment