From 27b66b20085cf076cbcc83b1dfe64c61d56e2cb3 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 24 Jun 2013 16:28:19 -0700 Subject: Specify the required Qt4 version to find_package --- utils/alsoft-config/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'utils/alsoft-config/CMakeLists.txt') diff --git a/utils/alsoft-config/CMakeLists.txt b/utils/alsoft-config/CMakeLists.txt index b5ac6b72..12e0ae48 100644 --- a/utils/alsoft-config/CMakeLists.txt +++ b/utils/alsoft-config/CMakeLists.txt @@ -3,12 +3,10 @@ project(alsoft-config) include_directories("${alsoft-config_BINARY_DIR}") # Need Qt 4.8.0 or newer for the iconset theme attribute to work -find_package(Qt4 COMPONENTS QtCore QtGui) -if(QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND ("${QT_VERSION_MAJOR}" GREATER "4" OR ("${QT_VERSION_MAJOR}" EQUAL "4" AND "${QT_VERSION_MINOR}" GREATER "7"))) +find_package(Qt4 4.8.0 COMPONENTS QtCore QtGui) +if(QT_QTCORE_FOUND AND QT_QTGUI_FOUND) include(${QT_USE_FILE}) - include_directories(${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}) - set(alsoft-config_SRCS main.cpp mainwindow.cpp ) @@ -22,7 +20,7 @@ if(QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND ("${QT_VERSION_MAJOR}" GREATER "4" OR add_executable(../../alsoft-config ${alsoft-config_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS}) target_link_libraries(../../alsoft-config ${QT_LIBRARIES}) - INSTALL(TARGETS ../../alsoft-config + install(TARGETS ../../alsoft-config RUNTIME DESTINATION bin LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}" -- cgit v1.2.3