adrido/minetest-mapper-cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildsystem

Browse Source
This commit is contained in:
adrido 2018-10-29 16:49:18 +01:00
parent a6135beeef
commit 4aaa8b166b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -7,6 +7,11 @@ set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set_property(GLOBAL PROPERTY USE_FOLDERS ON) 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 ( project (
"Minetestmapper" "Minetestmapper"
DESCRIPTION "Map generator for Minetest" DESCRIPTION "Map generator for Minetest"

6
Minetestmapper/CMakeLists.txt
View File

@ -113,9 +113,11 @@ set(CPACK_GENERATOR "ZIP")
include (CPack) include (CPack)
install (TARGETS Minetestmapper RUNTIME DESTINATION ".") install (TARGETS Minetestmapper RUNTIME DESTINATION ".")
# Config might not set, so there might missing dll's after installation if(WIN32)
install(DIRECTORY "${PROJECT_BINARY_DIR}/Minetestmapper/$<CONFIG>/" DESTINATION "." #copy required dlls to install dir
install(DIRECTORY "${PROJECT_BINARY_DIR}/Minetestmapper/" DESTINATION "."
FILES_MATCHING PATTERN "*.dll" PATTERN "/" EXCLUDE) FILES_MATCHING PATTERN "*.dll" PATTERN "/" EXCLUDE)
endif(WIN32)
install(DIRECTORY "${PROJECT_SOURCE_DIR}/colors/" DESTINATION "colors/" install(DIRECTORY "${PROJECT_SOURCE_DIR}/colors/" DESTINATION "colors/"
FILES_MATCHING PATTERN "*.txt") FILES_MATCHING PATTERN "*.txt")

1
Minetestmapper/Mapper.h
View File

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