diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 059bbcf..4ca7ef4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) add_executable(mapviewer main.cpp - multipolygon.cpp + Multipolygon.cpp Window.cpp ) diff --git a/src/multipolygon.cpp b/src/multipolygon.cpp index 89fe67d..1f2517f 100644 --- a/src/multipolygon.cpp +++ b/src/multipolygon.cpp @@ -1,4 +1,4 @@ -#include "multipolygon.hpp" +#include "Multipolygon.hpp" #include #include diff --git a/vendor/osmparser b/vendor/osmparser index 340774d..3023d82 160000 --- a/vendor/osmparser +++ b/vendor/osmparser @@ -1 +1 @@ -Subproject commit 340774d8f66f1cf359bfe01257bc26e8e64eb020 +Subproject commit 3023d822532d1d0ede6752d8787d8489f6229856 diff --git a/vendor/triangle/CMakeLists.txt b/vendor/triangle/CMakeLists.txt index 9e6095d..b7296d8 100644 --- a/vendor/triangle/CMakeLists.txt +++ b/vendor/triangle/CMakeLists.txt @@ -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) \ No newline at end of file