diff options
| -rw-r--r-- | .gitignore | 13 | ||||
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| m--------- | libicclient | 0 |
3 files changed, 12 insertions, 22 deletions
@@ -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 -Subproject 4443285897be4058891274e12d242dde25f0976 +Subproject a9eac750ab758d279dc97fc4bc5075ddc6f2289 |