Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Ported to Qt5.

Browse Source
This commit is contained in:
Jim Evins
2016-05-27 22:45:03 -04:00
parent 5a36e9ce88
commit 699960e4be
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/Merge/CMakeLists.txt
+3 -12
View File
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
###############################################################################
# gLabels Merge subsystem
@@ -29,21 +29,11 @@ set (merge_qobject_headers
Merge.h
)
set (merge_forms
)
set (merge_resource_files
)
qt4_wrap_cpp (merge_moc_sources ${merge_qobject_headers})
qt4_wrap_ui (merge_forms_headers ${merge_forms})
qt4_add_resources (merge_qrc_sources ${merge_resource_files})
qt5_wrap_cpp (merge_moc_sources ${merge_qobject_headers})
add_library (Merge STATIC
${merge_sources}
${merge_moc_sources}
${merge_qrc_sources}
${merge_forms_headers}
)
@@ -51,6 +41,7 @@ add_library (Merge STATIC
# Where to find stuff
#=======================================
include_directories (
${Qt5Widgets_INCLUDE_DIRS}
)
link_directories (