Page MenuHomePhabricator (Chris)
Files F86192

No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..d8baf02
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,59 @@
+project(barcoder)
+cmake_minimum_required(VERSION 3.1)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_BUILD_TYPE Release)
+add_definitions(-Wall)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_library(LDMTX dmtx REQUIRED)
+find_library(LQRENCODE qrencode REQUIRED)
+
+add_compile_definitions(
+ VERSION_MAJOR=1
+ VERSION_MINOR=1
+ VERSION_BUILD=1
+ #Target version
+ VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}"
+ VERSION_S="${VERSION}"
+ QT_DEPRECATED_WARNINGS
+ QT_DISABLE_DEPRECATED_BEFORE=0x050000
+)
+
+set(DESKTOP_FILE barcoder.desktop)
+set(ICON_FILE barcoder.png)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qqrencode)
+
+set(barcoder_SRCS
+ main.cpp
+ mainwindow.cpp
+ 3rdparty/qqrencode/qqrencode.cpp
+ )
+
+set(barcoder_UIS
+ mainwindow.ui
+ )
+QT5_WRAP_UI(UIS ${barcoder_UIS})
+
+set(barcoder_MOCS
+ mainwindow.h
+ )
+QT5_WRAP_CPP(MOCS ${barcoder_MOCS})
+
+add_executable(barcoder ${barcoder_SRCS} ${UIS} ${MOCS})
+target_link_libraries(barcoder Qt5::Core Qt5::Gui Qt5::Widgets dmtx qrencode)
+
+# installation
+if (HAIKU)
+ install(TARGETS barcoder RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+elseif (APPLE)
+ SET_TARGET_PROPERTIES(barcoder PROPERTIES MACOSX_BUNDLE TRUE)
+ INSTALL(TARGETS barcoder DESTINATION ${CMAKE_INSTALL_PREFIX})
+elseif (UNIX)
+ install(TARGETS barcoder RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ install(FILES ${DESKTOP_FILE} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+ install(FILES ${ICON_FILE} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps")
+endif ()
diff --git a/debian/changelog b/debian/changelog
index 892538a..8f703b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,44 +1,50 @@
-barcoder (1.1.0) oldstable stable unstable xenial bionic eoan focal groovy; urgency=low
+barcoder (1.1.1) unstable; urgency=medium
+
+ * Change debian/rules to cmake (no changes in qmakefile yet)
+
+ -- Chris <sneaky@yellow.lan> Wed, 24 Mar 2021 21:09:06 +1300
+
+barcoder (1.1.0) unstable; urgency=low
* polishing to debianization, removal of lots of code, some linting
-- Chris <git@chris-nz.com> Sun, 05 Jul 2020 22:00:00 -0000
barcoder (1.0.1) unstable; urgency=low
* huge overhaul of build stuff to make neat deb and source packages
-- Chris <git@chris-nz.com> Sat, 04 Jul 2020 08:35:50 -0000
barcoder (1.0.0) unstable; urgency=low
* improving premake, preparing for debianization (rev.6b986e4e)
* remove some dead code (rev.f237d18a)
* Remove unused isMicro() function (rev.c84b7b9b)
* Remove a couple of unused functions (rev.c3f7bc65)
* Add some license info for 3rd part QQREncode (rev.75b3a9f7)
* Update Readme to trigger re-render (rev.f4ff13b4)
* Update licence (rev.a386fcdb)
* better clipboard handling (rev.dc59f29a)
* suppress unused warning (rev.74bfdbb6)
* patch for differing clipbaord apis, fix clipboard segfault (rev.be57d568)
* fix segfault on long datamatrix input (rev.8a964fb6)
* removed dead code in mainwindow header (rev.8309d390)
* Update README.md to reflect new situation (rev.7891b3c2)
* Complete rewrite of mainwindow. (rev.eceaf8d5)
* Update README (rev.928c1c8f)
* Update README.md (rev.8341ad83)
* Create LICENSE (rev.478e129d)
* Update README.md (rev.d8a3e710)
* first push of readme (rev.0bdfe1cd)
* shouldn't have this file in repository (rev.63e13980)
* First commit! (rev.c0938417)
-- Chris <git@chris-nz.com> Sun, 28 Jun 2020 08:21:50 -0000
diff --git a/debian/rules b/debian/rules
index 28e97f9..00d1f88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-
-# qmake in build environment may not specify
-export QT_SELECT=qt5
+export DH_VERBOSE=1
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/qmake.mk
+include /usr/share/cdbs/1/class/cmake.mk
diff --git a/debian/source/barcoder.manpages b/debian/source/barcoder.manpages
new file mode 100644
index 0000000..43fe118
--- /dev/null
+++ b/debian/source/barcoder.manpages
@@ -0,0 +1 @@
+docs/barcoder.1
\ No newline at end of file

File Metadata

Mime Type
text/x-diff
Expires
Thu, Sep 11, 8:24 PM (21 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
42726
Default Alt Text
(4 KB)

Event Timeline