set include directory correctly

mathisloge · mathisloge · commit bde9f290215d · 2020-12-16T11:17:03.000+01:00
diff --git a/ports/comms-ublox/portfile.cmake b/ports/comms-ublox/portfile.cmake
@@ -18,10 +18,10 @@ vcpkg_configure_cmake(
         -DOPT_BUILD_PLUGIN=OFF
         -DOPT_NO_COMMS=ON
         -DOPT_EXTERNALS_UPDATE_DISCONNECTED=ON
+        -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include"
 )
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake
@@ -14,10 +14,10 @@ vcpkg_configure_cmake(
     OPTIONS
         -DCC_COMMS_LIB_ONLY=ON
         -DCC_NO_UNIT_TESTS=ON
+        -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include"
 )
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_configure_cmake(
         -DCOMMSDSL_NO_COMMS_CHAMPION=ON
         -DCOMMSDSL_NO_TESTS=ON
         -DCOMMSDSL_NO_WARN_AS_ERR=ON # remove on next version or on next version of boost
+        -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include"
 )
 vcpkg_install_cmake()
 
@@ -24,8 +25,6 @@ vcpkg_copy_tools(
     AUTO_CLEAN
 )
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ vcpkg_configure_cmake(`
`15`	`15`	`-DCOMMSDSL_NO_COMMS_CHAMPION=ON`
`16`	`16`	`-DCOMMSDSL_NO_TESTS=ON`
`17`	`17`	`-DCOMMSDSL_NO_WARN_AS_ERR=ON # remove on next version or on next version of boost`
	`18`	`+ -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include"`
`18`	`19`	`)`
`19`	`20`	`vcpkg_install_cmake()`
`20`	`21`
`@@ -24,8 +25,6 @@ vcpkg_copy_tools(`
`24`	`25`	`AUTO_CLEAN`
`25`	`26`	`)`
`26`	`27`
`27`		`-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")`
`28`		`-`
`29`	`28`	`if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")`
`30`	`29`	`file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")`
`31`	`30`	`endif()`