diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | CMakeLists.txt | 33 | ||||
| m--------- | libicclient | 0 |
3 files changed, 29 insertions, 9 deletions
@@ -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 -Subproject 211c5e1a57aa8958d64b16d61fcf04dc48d4383 +Subproject e7b6017449709bef714a272dc3e6dd93f68eb5d |