Fix last commit

Also drop more Qt4 code in order to achieve this.
yunzixun · Oct 18, 2016 · aa965ff · aa965ff
1 parent b9e4433
commit aa965ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 34 deletions.
diff --git a/libs/qcustomplot-source/CMakeLists.txt b/libs/qcustomplot-source/CMakeLists.txt
@@ -1,14 +1,8 @@
 cmake_minimum_required(VERSION 2.8.7)
 
-if(USE_QT5)
-    set(CMAKE_AUTOMOC ON)
-    set(CMAKE_INCLUDE_CURRENT_DIR ON)
-    find_package(Qt5Widgets REQUIRED)
-else()
-    find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-    include("${QT_USE_FILE}")
-    add_definitions(${QT_DEFINITIONS})
-endif()
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(Qt5Widgets REQUIRED)
 
 set(QCUSTOMPLOT_SRC
 	qcustomplot.cpp
@@ -21,13 +15,6 @@ set(QCUSTOMPLOT_MOC_HDR
 	qcustomplot.h
 )
 
-if(NOT USE_QT5)
-    QT4_WRAP_CPP(QCUSTOMPLOT_MOC ${QCUSTOMPLOT_MOC_HDR})
-endif()
-
 add_library(qcustomplot ${QCUSTOMPLOT_SRC} ${QCUSTOMPLOT_HDR} ${QCUSTOMPLOT_MOC})
 
-if(USE_QT5)
-	qt5_use_modules(qcustomplot Widgets PrintSupport)
-endif()
-
+qt5_use_modules(qcustomplot Widgets PrintSupport)
diff --git a/libs/qhexedit/CMakeLists.txt b/libs/qhexedit/CMakeLists.txt
@@ -1,14 +1,8 @@
 cmake_minimum_required(VERSION 2.8.7)
 
-if(USE_QT5)
-    set(CMAKE_AUTOMOC ON)
-    set(CMAKE_INCLUDE_CURRENT_DIR ON)
-    find_package(Qt5Widgets REQUIRED)
-else()
-    find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-    include("${QT_USE_FILE}")
-    add_definitions(${QT_DEFINITIONS})
-endif()
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(Qt5Widgets REQUIRED)
 
 set(QHEXEDIT_SRC
     src/qhexedit.cpp
@@ -26,13 +20,6 @@ set(QHEXEDIT_MOC_HDR
 	src/commands.h
 )
 
-if(NOT USE_QT5)
-    QT4_WRAP_CPP(QHEXEDIT_MOC ${QHEXEDIT_MOC_HDR})
-endif()
-
 add_library(qhexedit ${QHEXEDIT_SRC} ${QHEXEDIT_HDR} ${QHEXEDIT_MOC})
 
-if(USE_QT5)
-    qt5_use_modules(qhexedit Widgets)
-endif()
-
+qt5_use_modules(qhexedit Widgets)