diff options
| -rw-r--r-- | CMakeLists.txt | 37 | ||||
| -rw-r--r-- | client.cxx | 3 | ||||
| -rw-r--r-- | qicclient.hxx (renamed from qicclient/client.hxx) | 1 |
3 files changed, 12 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 15a39d7..c7ff803 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,48 +2,31 @@ cmake_minimum_required(VERSION 3.5) project(qicclient) set(CMAKE_AUTOMOC ON) find_package(Qt5Core) - set(HDRS - ${PROJECT_NAME}/product.hxx ${PROJECT_NAME}/catalog.hxx - ${PROJECT_NAME}/client.hxx + ${PROJECT_NAME}/product.hxx + ${PROJECT_NAME}/ord.hxx + ${PROJECT_NAME}/member.hxx + ${PROJECT_NAME}/admin.hxx ) - -if (NOT EMSCRIPTEN) - set(HDRS - ${HDRS} - ${PROJECT_NAME}/ord.hxx - ${PROJECT_NAME}/member.hxx - ${PROJECT_NAME}/admin.hxx - ) -endif() - set(SRCS + ${PROJECT_NAME}.hxx ${HDRS} - catalog.cxx client.cxx + catalog.cxx + ord.cxx + member.cxx + admin.cxx ) - -if (NOT EMSCRIPTEN) - set(SRCS - ${SRCS} - ord.cxx - member.cxx - admin.cxx - ) -endif() - if (EMSCRIPTEN OR IOS) add_library(${PROJECT_NAME} STATIC ${SRCS}) else() add_library(${PROJECT_NAME} SHARED ${SRCS}) endif() - target_link_libraries(${PROJECT_NAME} Qt5::Core icclient ) - -target_compile_definitions(${PROJECT_NAME} PRIVATE QICCLIENT) install(TARGETS ${PROJECT_NAME} DESTINATION lib) +install(FILES ${PROJECT_NAME}.hxx DESTINATION include) install(FILES ${HDRS} DESTINATION include/${PROJECT_NAME}) @@ -1,9 +1,8 @@ #include <memory> #include <QObject> #include <icclient/typedefs.h> -#include "qicclient/catalog.hxx" +#include "qicclient.hxx" #include "qicclient/ord.hxx" -#include "qicclient/client.hxx" static QICClient::Client *client; diff --git a/qicclient/client.hxx b/qicclient.hxx index 1a86a36..aa8bca9 100644 --- a/qicclient/client.hxx +++ b/qicclient.hxx @@ -2,6 +2,7 @@ #define QICCLIENT_CLIENT_HXX #include <QObject> +#include <qicclient/catalog.hxx> #include <icclient.h> namespace QICClient { |