Rename qrtclient/client.hxx to qrtclient.hxx

4 files changed, 19 insertions, 22 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bee888..ba130f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,37 +1,34 @@
 cmake_minimum_required(VERSION 3.5)
-
 project(qrtclient)
-
 set(CMAKE_AUTOMOC ON)
-
 find_package(Qt5Core)
-
-add_library(${PROJECT_NAME} SHARED
+set(HDRS
 	${PROJECT_NAME}/user.hxx
 	${PROJECT_NAME}/ticket.hxx
 	${PROJECT_NAME}/tickethistory.hxx
-	${PROJECT_NAME}/client.hxx
+	)
+set(SRCS
+	${PROJECT_NAME}.hxx
+	${HDRS}
 	user.cxx
 	ticket.cxx
 	tickethistory.cxx
 	client.cxx
 	)
-
-if (APPLE)
+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 	include_directories(/usr/local/include)
-	target_link_directories(${PROJECT_NAME} PRIVATE /usr/local/lib)
+	link_directories(/usr/local/lib)
+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
 	rtclient
 	)
-
-install(TARGETS ${PROJECT_NAME} DESTINATION lib)
-install(FILES
-	${PROJECT_NAME}/user.hxx
-	${PROJECT_NAME}/ticket.hxx
-	${PROJECT_NAME}/tickethistory.hxx
-	${PROJECT_NAME}/client.hxx
-	DESTINATION include/${PROJECT_NAME}
-	)
+include(GNUInstallDirs)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES ${PROJECT_NAME}.hxx DESTINATION include)
+install(FILES ${HDRS} DESTINATION include/${PROJECT_NAME})
diff --git a/client.cxx b/client.cxx
index ed24ef2..4bf8169 100644
--- a/client.cxx
+++ b/client.cxx
@@ -1,8 +1,8 @@
 #include <QStringBuilder>
-#include <rtclient/client.h>
+#include <rtclient.h>
 #include <rtclient/ticket.h>
 #include <rtclient/search.h>
-#include "qrtclient/client.hxx"
+#include "qrtclient.hxx"
 
 namespace RTClient {
 
diff --git a/qrtclient/client.hxx b/qrtclient.hxx
index e9e6b0f..e9e6b0f 100644
--- a/qrtclient/client.hxx
+++ b/qrtclient.hxx
diff --git a/user.cxx b/user.cxx
index 2f031e8..8a54e5f 100644
--- a/user.cxx
+++ b/user.cxx
@@ -1,5 +1,5 @@
 #include <cstddef>
-#include <rtclient/client.h>
+#include <rtclient.h>
 #include "qrtclient/user.hxx"
 
 namespace RTClient {