diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f0c342..e68ea7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,11 @@ set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set_property(GLOBAL PROPERTY USE_FOLDERS ON) +if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE) + set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + CACHE STRING "") +endif() + project ( "Minetestmapper" DESCRIPTION "Map generator for Minetest" diff --git a/Minetestmapper/CMakeLists.txt b/Minetestmapper/CMakeLists.txt index f193ed1..3cc52f6 100644 --- a/Minetestmapper/CMakeLists.txt +++ b/Minetestmapper/CMakeLists.txt @@ -113,9 +113,11 @@ set(CPACK_GENERATOR "ZIP") include (CPack) install (TARGETS Minetestmapper RUNTIME DESTINATION ".") -# Config might not set, so there might missing dll's after installation -install(DIRECTORY "${PROJECT_BINARY_DIR}/Minetestmapper/$/" DESTINATION "." +if(WIN32) +#copy required dlls to install dir +install(DIRECTORY "${PROJECT_BINARY_DIR}/Minetestmapper/" DESTINATION "." FILES_MATCHING PATTERN "*.dll" PATTERN "/" EXCLUDE) +endif(WIN32) install(DIRECTORY "${PROJECT_SOURCE_DIR}/colors/" DESTINATION "colors/" FILES_MATCHING PATTERN "*.txt") diff --git a/Minetestmapper/Mapper.h b/Minetestmapper/Mapper.h index ac72dd4..15b7dde 100644 --- a/Minetestmapper/Mapper.h +++ b/Minetestmapper/Mapper.h @@ -1,7 +1,6 @@ #pragma once #include "TileGenerator.h" -#include #include #include