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

---
 .gitignore     | 13 +------------
 CMakeLists.txt | 21 +++++++++++----------
 libicclient    |  2 +-
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce049c2..bb18bf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,4 @@
-*.o
 *.swp
-*moc*
-.cmake
-CMakeCache.txt
-CMakeFiles
 CMakeLists.txt.user
-Makefile
-android-build
-android_deployment_settings.json*
-cmake_install.cmake
+build*
 html
-install_manifest.txt
-libqicclient.a
-qicclient_autogen
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
diff --git a/libicclient b/libicclient
index 4443285..a9eac75 160000
--- a/libicclient
+++ b/libicclient
@@ -1 +1 @@
-Subproject commit 4443285897be4058891274e12d242dde25f09760
+Subproject commit a9eac750ab758d279dc97fc4bc5075ddc6f22896
-- 
cgit v1.2.3