Merge pull request #13 from index1207/develop

Change CMake script

Author: index1207

CMakeLists.txt

@@ -3,10 +3,15 @@
 project(netcpp VERSION 0.3 DESCRIPTION "C++ Network library.")
 set(CMAKE_CXX_STANDARD 20)
 
-include_directories(include/net)
+include(GNUInstallDirs)
 
-add_library(netcpp SHARED
-        src/PCH.cpp
+set(INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include")
+set(EXPORT_NAMESPACE "${PROJECT_NAME}::")
+set(CMAKE_CONFIG_FILE_BASENAME "${PROJECT_NAME}Config.cmake")
+set(CMAKE_EXPORT_FILE_BASENAME "${PROJECT_NAME}Export.cmake")
+
+set(HEADER_FILES ${INCLUDES}/net/netcpp.hpp)
+set(SOURCE_FILES
         src/IoSystem.cpp
         src/Dns.cpp
         src/Endpoint.cpp
@@ -15,7 +20,16 @@ add_library(netcpp SHARED
         src/IpAddress.cpp
         src/netcpp.cpp
         src/Socket.cpp
-        src/Native.cpp)
+        src/Native.cpp
+        ${HEADER_FILES})
+
+string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}")
+
+add_compile_definitions(NETCPP_BUILD)
+
+add_library(netcpp STATIC ${SOURCE_FILES})
+
+add_library(${EXPORT_NAMESPACE}${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 target_include_directories(netcpp PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/src)
@@ -24,17 +38,33 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 target_link_libraries(netcpp ws2_32)
 
-target_precompile_headers(netcpp
-        PRIVATE
-        src/PCH.h)
+target_precompile_headers(netcpp PRIVATE ${HEADER_FILES})
+
+target_include_directories(netcpp PUBLIC
+        $<BUILD_INTERFACE:${INCLUDES}>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+file(GLOB_RECURSE HEADERS "${INCLUDES}/*.h" "${INCLUDES}/*.hxx" "${INCLUDES}/*.hpp")
+string(REPLACE "/${CMAKE_LIBRARY_ARCHITECTURE}" "" CMAKE_INSTALL_LIBDIR_ARCHIND "${CMAKE_INSTALL_LIBDIR}")
+foreach(headerFile ${HEADERS})
+    get_filename_component(headerFileParentDir "${headerFile}" DIRECTORY)
+    file(RELATIVE_PATH headerFileRelParentDir "${INCLUDES}" "${headerFileParentDir}")
+
+    install(FILES "${headerFile}"
+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${headerFileRelParentDir}"
+    )
+endforeach()
 
 install(TARGETS netcpp
-        EXPORT netcpp_targets
-        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-
-install(EXPORT netcpp_targets
-        FILE netcpp-targets.cmake
-        NAMESPACE netcpp::
-        DESTINATION share/netcpp)
+        EXPORT netcpp
+        INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+export(TARGETS "${PROJECT_NAME}"
+        NAMESPACE "${EXPORT_NAMESPACE}"
+        FILE "${CMAKE_EXPORT_FILE_BASENAME}"
+        EXPORT_LINK_INTERFACE_LIBRARIES)
+
+install(EXPORT "${PROJECT_NAME}"
+        FILE "${CMAKE_CONFIG_FILE_BASENAME}"
+        NAMESPACE "${EXPORT_NAMESPACE}"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR_ARCHIND}/cmake/${PROJECT_NAME}")

include/net/Context.hpp

@@ -3,6 +3,7 @@
 #include <memory>
 #include <atomic>
 #include <functional>
+
 #include "Socket.hpp"
 
 namespace net

include/net/Endpoint.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+
 #include "IpAddress.hpp"
 
 namespace net

include/net/IoSystem.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <WinSock2.h>
-
 #include <vector>
 #include <thread>
 #include <mutex>

include/net/IpAddress.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <WinSock2.h>
 #include <string>
 
 namespace net

include/net/Native.hpp

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <WinSock2.h>
-#include <MSWSock.h>
-
 namespace net
 {
 	class Native

include/net/Socket.hpp

@@ -2,13 +2,11 @@
 
 #include <span>
 #include <memory>
+#include <optional>
 
 #include "IpAddress.hpp"
 #include "Endpoint.hpp"
 
-#include <mutex>
-#include <optional>
-
 namespace net
 {
 	enum class AddressFamily

include/net/netcpp.hpp

@@ -1,16 +1,11 @@
 #pragma once
 
-// Socket Utility
-#include "Native.hpp"
-#include "IpAddress.hpp"
-#include "Endpoint.hpp"
-
-// IO
-#include "IoSystem.hpp"
-#include "Socket.hpp"
-#include "Context.hpp"
-
-// Network Utility
-#include "Dns.hpp"
-
-#include <stdexcept>
+// Standard
+#include <stdexcept>
+#include <string>
+#include <format>
+
+// WinSock2
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+#include <MSWSock.h>

src/Context.cpp

@@ -1,5 +1,4 @@
-#include "PCH.h"
-#include "Context.hpp"
+#include "net/Context.hpp"
 
 using namespace net;
 

src/Dns.cpp

@@ -1,6 +1,5 @@
-#include "PCH.h"
-#include "Dns.hpp"
-#include "IpAddress.hpp"
+#include "net/Dns.hpp"
+#include "net/IpAddress.hpp"
 
 using namespace net;