From 4e13e65b1cdbb17e527f729b8f8d7f38851ac21d Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <anonymous.maarten@gmail.com>
Date: Mon, 30 Nov 2020 19:26:09 +0100
Subject: [PATCH] cmake: add missing files + remove CMakeCPack + add
 librw::librw target ALIAS

---
 CMakeCPack.cmake   | 15 ---------------
 CMakeLists.txt     | 13 ++++++++++---
 src/CMakeLists.txt |  3 +++
 3 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 CMakeCPack.cmake

diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
deleted file mode 100644
index 80654aa..0000000
--- a/CMakeCPack.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A (partial) re-implementation of RenderWare Graphics")
-set(CPACK_PACKAGE_VENDOR "librw")
-
-# FIXME: better description of the project
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/LICENSE")
-set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
-
-set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
-
-# set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CMakeCPackOptions.cmake")
-
-include(CPack)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f94dfc3..c6e0f5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,9 +49,16 @@ if(LIBRW_INSTALL)
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
         )
     install(
-        EXPORT librw-targets
+        EXPORT librw-targets NAMESPACE librw::
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
         )
-
-    include(CMakeCPack.cmake)
+    set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
+    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A (partial) re-implementation of RenderWare Graphics")
+    set(CPACK_PACKAGE_VENDOR "aap")
+    set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/LICENSE")
+    set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
+    set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
+    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}")
+    include(CPack)
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 361a620..2a7ada3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -99,6 +99,7 @@ add_library(librw
     ps2/rwps2impl.h
     ps2/rwps2plg.h
     )
+add_library(librw::librw ALIAS librw)
 
 target_include_directories(librw
     INTERFACE
@@ -174,6 +175,7 @@ if(LIBRW_INSTALL)
         FILES
             base.err
             rwbase.h
+            rwcharset.h
             rwerror.h
             rwplg.h
             rwrender.h
@@ -203,6 +205,7 @@ if(LIBRW_INSTALL)
         FILES
             gl/rwwdgl.h
             gl/rwgl3.h
+            gl/rwgl3plg.h
             gl/rwgl3shader.h
         DESTINATION "${LIBRW_INSTALL_INCLUDEDIR}/src/gl"
         )