Update buildsystem

master
adrido 2018-10-29 16:49:18 +01:00
parent a6135beeef
commit 4aaa8b166b
3 changed files with 9 additions and 3 deletions

View File

@ -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"

View File

@ -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/$<CONFIG>/" 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")

View File

@ -1,7 +1,6 @@
#pragma once
#include "TileGenerator.h"
#include <getopt.h>
#include <istream>
#include <string>