lauchmelder/MapViewer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixed build errors

Browse source
This commit is contained in:
Lauchmelder 2022-05-03 18:59:28 +02:00
parent 2bbd40d0f2
commit 2d68305828
No known key found for this signature in database
GPG key ID: C2403C69D78F011D
4 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
add_executable(mapviewer add_executable(mapviewer
main.cpp main.cpp
multipolygon.cpp Multipolygon.cpp
Window.cpp Window.cpp
) )

2
src/multipolygon.cpp
View file

@ -1,4 +1,4 @@
#include "multipolygon.hpp" #include "Multipolygon.hpp"
#include <vector> #include <vector>
#include <array> #include <array>

2
vendor/osmparser vendored

@ -1 +1 @@
Subproject commit 340774d8f66f1cf359bfe01257bc26e8e64eb020 Subproject commit 3023d822532d1d0ede6752d8787d8489f6229856

15
vendor/triangle/CMakeLists.txt vendored
View file

@ -1,22 +1,13 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
file(GLOB_RECURSE CPP_FILES SET_SOURCE_FILES_PROPERTIES( "src/triangle.c" PROPERTIES LANGUAGE CXX )
"src/*.c"
)
file(GLOB_RECURSE HPP_FILES
"include/*.h"
)
SET_SOURCE_FILES_PROPERTIES( ${CPP_FILES} PROPERTIES LANGUAGE CXX )
add_library(triangle STATIC add_library(triangle STATIC
${CPP_FILES} ${HPP_FILES} "src/triangle.c"
) )
target_include_directories(triangle PUBLIC target_include_directories(triangle PUBLIC
include ${CMAKE_CURRENT_LIST_DIR}/include
${TINYXML2_INCLUDE_DIR}
) )
target_compile_definitions(triangle PUBLIC NO_TIMER TRILIBRARY REDUCED DCT_ONLY ANSI_DECLARATORS) target_compile_definitions(triangle PUBLIC NO_TIMER TRILIBRARY REDUCED DCT_ONLY ANSI_DECLARATORS)