2 files changed, 11 insertions, 7 deletions
diff --git a/ports/readosm/CONTROL b/ports/readosm/CONTROL
index 104ef3b5c..7a2d817ff 100644
--- a/ports/readosm/CONTROL
+++ b/ports/readosm/CONTROL
@@ -1,5 +1,7 @@
 Source: readosm
-Version: 1.1.0-2
+Version: 1.1.0
+Port-Version: 3
 Homepage: https://www.gaia-gis.it/gaia-sins/readosm-sources
 Description: ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf)
 Build-Depends: expat, zlib
+Supports: !(linux|osx|uwp)
diff --git a/ports/readosm/portfile.cmake b/ports/readosm/portfile.cmake
index 8059a6ffa..522e6fdf5 100644
--- a/ports/readosm/portfile.cmake
+++ b/ports/readosm/portfile.cmake
@@ -1,4 +1,4 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP")
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://www.gaia-gis.it/gaia-sins/readosm-sources/readosm-1.1.0.tar.gz"
@@ -16,13 +16,14 @@ vcpkg_extract_source_archive_ex(
 
 find_program(NMAKE nmake)
 
-set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"")
-set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/expat.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"")
-
 if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
+    set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/libexpatd.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"")
+    set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/libexpat.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"")
 	set(CL_FLAGS_DBG "/MDd /Zi")
 	set(CL_FLAGS_REL "/MD /Ox")
 else()
+    set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/libexpatdMD.lib\" \"${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib\"")
+    set(LIBS_ALL_REL "\"${CURRENT_INSTALLED_DIR}/lib/libexpatMD.lib\" \"${CURRENT_INSTALLED_DIR}/lib/zlib.lib\"")
 	set(CL_FLAGS_DBG "/MTd /Zi")
 	set(CL_FLAGS_REL "/MT /Ox")
 endif()
@@ -64,7 +65,6 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/readosm RENAME copyright)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
@@ -82,5 +82,7 @@ else()
   endif()
 endif()
 
-
 message(STATUS "Packaging ${TARGET_TRIPLET} done")
+
+#Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+\ No newline at end of file