Keep WTL headers where they belong.

chrullrich · May 14, 2024 · ebd3974 · ebd3974
1 parent 9a6062c
commit ebd3974
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/ports/wtl/atlribbon-24933.patch b/ports/wtl/atlribbon-24933.patch
@@ -0,0 +1,17 @@
+--- a/Include/atlribbon.h	2022-06-06 03:12:54.312690900 +0200
++++ b/Include/atlribbon.h	2022-06-06 03:13:24.337068900 +0200
+@@ -27,10 +27,10 @@
+ 	#error atlribbon.h requires atlapp.h to be included first
+ #endif
+
+-#include <atlmisc.h>    // for RecentDocumentList classes
+-#include <atlframe.h>   // for Frame and UpdateUI classes
+-#include <atlctrls.h>   // required for atlctrlw.h
+-#include <atlctrlw.h>   // for CCommandBarCtrl
++#include "atlmisc.h"    // for RecentDocumentList classes
++#include "atlframe.h"   // for Frame and UpdateUI classes
++#include "atlctrls.h"   // required for atlctrlw.h
++#include "atlctrlw.h"   // for CCommandBarCtrl
+
+ #ifndef __ATLSTR_H__
+   #pragma warning(push)
diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake
@@ -13,8 +13,8 @@ vcpkg_from_sourceforge(
         atlribbon.h-wtl66.patch
 )
 
-file(INSTALL "${SOURCE_PATH}/Include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h")
-file(COPY "${SOURCE_PATH}/Samples" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(COPY "${SOURCE_PATH}/AppWizard" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL ${SOURCE_PATH}/Include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT} FILES_MATCHING PATTERN "*.h")
+file(COPY ${SOURCE_PATH}/Samples DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${SOURCE_PATH}/AppWizard DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 
-file(INSTALL "${SOURCE_PATH}/MS-PL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/MS-PL.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)