diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index 11fa927..e9fe159 100644 --- 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}) diff --git a/qad/QtProject.cmake b/qad/QtProject.cmake index 2fb0230..dd3c5c1 100644 --- 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)