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?= Date: Tue, 31 Mar 2020 19:41:48 +0800 Subject: Build shared library, and prepare installation and rely on system installed libicclient. --- .gitignore | 5 ++++- CMakeLists.txt | 33 +++++++++++++++++++++++++-------- libicclient | 2 +- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 9a6be5c..869288a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,14 @@ +android-build +android_deployment_settings.json* CMakeCache.txt CMakeFiles cmake_install.cmake CMakeLists.txt.user html +install_manifest.txt libqicclient.a Makefile -moc_* +*moc* *.o qicclient_autogen *.swp 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} + ) diff --git a/libicclient b/libicclient index 211c5e1..e7b6017 160000 --- a/libicclient +++ b/libicclient @@ -1 +1 @@ -Subproject commit 211c5e1a57aa8958d64b16d61fcf04dc48d43837 +Subproject commit e7b6017449709bef714a272dc3e6dd93f68eb5d2 -- cgit v1.2.3