diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | qicclient.pro | 19 | ||||
| -rw-r--r-- | qicclient/catalog.hxx | 2 |
4 files changed, 23 insertions, 22 deletions
@@ -1,7 +1,10 @@ +CMakeCache.txt +CMakeFiles +cmake_install.cmake +CMakeLists.txt.user libqicclient.a Makefile moc_* *.o -qicclient.pro.user -.qmake.stash +qicclient_autogen *.swp diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..14c9127 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,17 @@ +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 + user.cxx + catalog.cxx + basket.cxx + client.cxx) + +target_link_libraries(${PROJECT_NAME} Qt5::Core) + +include_directories(libicclient) diff --git a/qicclient.pro b/qicclient.pro deleted file mode 100644 index 4d7150b..0000000 --- a/qicclient.pro +++ /dev/null @@ -1,19 +0,0 @@ -QT -= gui -TEMPLATE = lib -CONFIG += staticlib - -HEADERS += \ - qicclient/user.hxx \ - qicclient/product.hxx \ - qicclient/catalog.hxx \ - qicclient/basket.hxx \ - qicclient/client.hxx -SOURCES += \ - user.cxx \ - catalog.cxx \ - basket.cxx \ - client.cxx -INCLUDEPATH += $$PWD/libicclient -LIBS += $$PWD/libicclient/libicclient.a - -debug: DEFINES += DEBUG diff --git a/qicclient/catalog.hxx b/qicclient/catalog.hxx index d539149..38e257a 100644 --- a/qicclient/catalog.hxx +++ b/qicclient/catalog.hxx @@ -2,7 +2,7 @@ #define QICCLIENT_CATALOG_HXX #include <QAbstractListModel> -#include <qicclient/product.hxx> +#include "product.hxx" struct icclient_catalog; |