From a5e37f8fce723ea98d322ea8712ae6a9a16162e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?=
 =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?=
 =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= <erik@darapsa.co.id>
Date: Wed, 25 Sep 2019 10:15:43 +0800
Subject: CMakeLists.txt

Still having a bug of undefined references when an app links to this
library, which they say will be fixed in Qt 5.14.
---
 CMakeLists.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 CMakeLists.txt

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..6172f3f
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.0.0)
+
+project(qicclient VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_AUTOMOC ON)
+
+find_package(Qt5Core)
+
+add_library(${PROJECT_NAME} STATIC
+	client.cxx)
+
+target_link_libraries(${PROJECT_NAME} Qt5::Core)
+
+include_directories(libicclient)
-- 
cgit v1.2.3


From 8495e87c3215b9464725ecc87d3edad25e144175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?=
 =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?=
 =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= <erik@darapsa.co.id>
Date: Tue, 31 Mar 2020 19:41:48 +0800
Subject: Build shared library, and prepare installation

and rely on system installed libicclient.
---
 CMakeLists.txt | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14c9127..3c34e54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,34 @@
 cmake_minimum_required(VERSION 3.0.0)
 
-project(qicclient VERSION 0.1 LANGUAGES CXX)
+project(qicclient)
 
 set(CMAKE_AUTOMOC ON)
 
 find_package(Qt5Core)
 
-add_library(${PROJECT_NAME} STATIC
-	user.cxx
-	catalog.cxx
-	basket.cxx
-	client.cxx)
+qt5_generate_moc(user.cxx user.moc TARGET ${PROJECT_NAME})
+qt5_generate_moc(catalog.cxx catalog.moc TARGET ${PROJECT_NAME})
+qt5_generate_moc(basket.cxx basket.moc TARGET ${PROJECT_NAME})
+qt5_generate_moc(client.cxx client.moc TARGET ${PROJECT_NAME})
 
-target_link_libraries(${PROJECT_NAME} Qt5::Core)
+add_library(${PROJECT_NAME} SHARED
+	user.moc
+	catalog.moc
+	basket.moc
+	client.moc
+	)
 
-include_directories(libicclient)
+target_link_libraries(${PROJECT_NAME}
+	Qt5::Core
+	icclient
+	)
+
+install(TARGETS ${PROJECT_NAME} DESTINATION lib)
+install(FILES
+	${PROJECT_NAME}/user.hxx
+	${PROJECT_NAME}/product.hxx
+	${PROJECT_NAME}/catalog.hxx
+	${PROJECT_NAME}/basket.hxx
+	${PROJECT_NAME}/client.hxx
+	DESTINATION include/${PROJECT_NAME}
+	)
-- 
cgit v1.2.3


From 4a29ec9723aef6b6d6a8e37fc49a2eb66bd095d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?=
 =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?=
 =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= <erik@darapsa.co.id>
Date: Sat, 6 Jun 2020 23:23:14 +0800
Subject: Simplify CMakeLists.txt much

---
 CMakeLists.txt | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c34e54..bedb9ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.5)
 
 project(qicclient)
 
@@ -6,16 +6,15 @@ set(CMAKE_AUTOMOC ON)
 
 find_package(Qt5Core)
 
-qt5_generate_moc(user.cxx user.moc TARGET ${PROJECT_NAME})
-qt5_generate_moc(catalog.cxx catalog.moc TARGET ${PROJECT_NAME})
-qt5_generate_moc(basket.cxx basket.moc TARGET ${PROJECT_NAME})
-qt5_generate_moc(client.cxx client.moc TARGET ${PROJECT_NAME})
-
 add_library(${PROJECT_NAME} SHARED
-	user.moc
-	catalog.moc
-	basket.moc
-	client.moc
+	${PROJECT_NAME}/user.hxx
+	${PROJECT_NAME}/catalog.hxx
+	${PROJECT_NAME}/basket.hxx
+	${PROJECT_NAME}/client.hxx
+	user.cxx
+	catalog.cxx
+	basket.cxx
+	client.cxx
 	)
 
 target_link_libraries(${PROJECT_NAME}
@@ -23,6 +22,8 @@ target_link_libraries(${PROJECT_NAME}
 	icclient
 	)
 
+target_compile_definitions(${PROJECT_NAME} PRIVATE QICCLIENT)
+
 install(TARGETS ${PROJECT_NAME} DESTINATION lib)
 install(FILES
 	${PROJECT_NAME}/user.hxx
-- 
cgit v1.2.3