git-svn-id: svn://db.shs.com.ru/libs@215 a8b55f48-bf90-11e4-a774-851b48703e85

2017-05-16 12:53:00 +00:00
parent e82bd1bf00
commit a37bb311b5
2 changed files with 1 additions and 4 deletions
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -12,6 +12,7 @@ else()
 	endif()
 	find_package(PIP REQUIRED)
 endif()
+find_package(Qt4 REQUIRED)
 find_package(QAD REQUIRED)
 message(STATUS "Building ${PROJECT_NAME}")
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} ${PIP_INCLUDES} ${QAD_INCLUDES})
--- a/qad/QtProject.cmake
+++ b/qad/QtProject.cmake
@@ -1,7 +1,3 @@
-set(QTVERSION 4)
-find_package(Qt${QTVERSION} REQUIRED)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
 macro(qt_project NAME _TYPE _LIBS _H_OUT _CPP_OUT)
 	project(${NAME})
 	find_package(Qt4 REQUIRED)