fixed build errors
This commit is contained in:
parent
2bbd40d0f2
commit
2d68305828
|
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
|
|||
|
||||
add_executable(mapviewer
|
||||
main.cpp
|
||||
multipolygon.cpp
|
||||
Multipolygon.cpp
|
||||
Window.cpp
|
||||
)
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "multipolygon.hpp"
|
||||
#include "Multipolygon.hpp"
|
||||
|
||||
#include <vector>
|
||||
#include <array>
|
||||
|
|
2
vendor/osmparser
vendored
2
vendor/osmparser
vendored
|
@ -1 +1 @@
|
|||
Subproject commit 340774d8f66f1cf359bfe01257bc26e8e64eb020
|
||||
Subproject commit 3023d822532d1d0ede6752d8787d8489f6229856
|
15
vendor/triangle/CMakeLists.txt
vendored
15
vendor/triangle/CMakeLists.txt
vendored
|
@ -1,22 +1,13 @@
|
|||
cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
file(GLOB_RECURSE CPP_FILES
|
||||
"src/*.c"
|
||||
)
|
||||
|
||||
file(GLOB_RECURSE HPP_FILES
|
||||
"include/*.h"
|
||||
)
|
||||
|
||||
SET_SOURCE_FILES_PROPERTIES( ${CPP_FILES} PROPERTIES LANGUAGE CXX )
|
||||
SET_SOURCE_FILES_PROPERTIES( "src/triangle.c" PROPERTIES LANGUAGE CXX )
|
||||
|
||||
add_library(triangle STATIC
|
||||
${CPP_FILES} ${HPP_FILES}
|
||||
"src/triangle.c"
|
||||
)
|
||||
|
||||
target_include_directories(triangle PUBLIC
|
||||
include
|
||||
${TINYXML2_INCLUDE_DIR}
|
||||
${CMAKE_CURRENT_LIST_DIR}/include
|
||||
)
|
||||
|
||||
target_compile_definitions(triangle PUBLIC NO_TIMER TRILIBRARY REDUCED DCT_ONLY ANSI_DECLARATORS)
|
Loading…
Reference in a new issue