Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ped plugin #620

Merged
merged 12 commits into from
Aug 16, 2024
Merged

Fix ped plugin #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8c07e2c
modified: src/v2i-hub/CommandPlugin/src/CommandPlugin.cpp
jwillmartin Jun 22, 2024
6ddd9e6
modified: src/v2i-hub/PedestrianPlugin/src/PedestrianPlugin.cpp
jwillmartin Jun 26, 2024
7cfdd3d
modified: src/v2i-hub/PedestrianPlugin/src/include/PedestrianPlugi…
jwillmartin Jun 26, 2024
c5eae26
modified: src/v2i-hub/PedestrianPlugin/src/PedestrianPlugin.cpp
jwillmartin Jun 27, 2024
3f14af6
Merge remote-tracking branch 'origin' into fix-ped-plugin
jwillmartin Jun 27, 2024
30b5ff2
modified: src/v2i-hub/CommandPlugin/src/CommandPlugin.cpp
jwillmartin Jun 28, 2024
d51d9f8
modified: examples/tmx-exampleapps/EmptyPlugin/CMakeLists.txt
jwillmartin Aug 2, 2024
d54f07e
new file: src/v2i-hub/PedestrianPlugin/scripts/sendPSM.py
jwillmartin Aug 12, 2024
40c34c3
modified: src/v2i-hub/PedestrianPlugin/src/PedestrianPlugin.cpp
jwillmartin Aug 12, 2024
1381bd9
modified: ext/build.sh
jwillmartin Aug 14, 2024
e2bdc01
modified: src/v2i-hub/PedestrianPlugin/src/PedestrianPlugin.cpp
jwillmartin Aug 14, 2024
dd462ac
modified: src/v2i-hub/PedestrianPlugin/src/include/PedestrianPlugi…
jwillmartin Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/tmx-exampleapps/EmptyPlugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ PROJECT ( EmptyPlugin VERSION 3.0.0 LANGUAGES CXX )

BuildTmxPlugin ( )

TARGET_LINK_LIBRARIES (${PROJECT_NAME} tmxutils)
TARGET_LINK_LIBRARIES (${PROJECT_NAME} tmxutils pugixml)
2 changes: 1 addition & 1 deletion examples/tmx-exampleapps/EmptyPlugin/src/EmptyPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include <AppAlert.h>
#include <algorithm>
#include <tmx/messages/message_document.hpp>
#include <tmx/pugixml/pugixml.hpp>
#include <pugixml.hpp>
#include <ParsedMap.h>
#include <MapSupport.h>
#include <sstream>
Expand Down
8 changes: 8 additions & 0 deletions ext/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,11 @@ make -j${numCPU}
make install
popd

# pugixml
pushd /tmp
git clone https://github.com/zeux/pugixml.git --branch v1.14
cd pugixml
cmake .
make -j${numCPU}
make install
popd
4 changes: 2 additions & 2 deletions src/tmx/TmxApi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ IF (NOT TMXAPI_NO_STATIC)
TARGET_INCLUDE_DIRECTORIES (${PROJECT_NAME}Static SYSTEM PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
${Boost_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES (${PROJECT_NAME}Static ${ASN_J2735_LIBRARIES} ${Boost_LIBRARIES} ${ICU_LIBRARIES})
TARGET_LINK_LIBRARIES (${PROJECT_NAME}Static ${ASN_J2735_LIBRARIES} ${Boost_LIBRARIES} ${ICU_LIBRARIES} pugixml)
IF (Boost_DEFS)
TARGET_COMPILE_DEFINITIONS (${PROJECT_NAME}Static PUBLIC ${Boost_DEFS})
ENDIF (Boost_DEFS)
Expand All @@ -68,7 +68,7 @@ IF (NOT TMXAPI_NO_SHARED)
TARGET_INCLUDE_DIRECTORIES (${PROJECT_NAME} SYSTEM PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
${Boost_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES (${PROJECT_NAME} PUBLIC ${ASN_J2735_LIBRARIES} ${Boost_LIBRARIES} ${ICU_LIBRARIES})
TARGET_LINK_LIBRARIES (${PROJECT_NAME} PUBLIC ${ASN_J2735_LIBRARIES} ${Boost_LIBRARIES} ${ICU_LIBRARIES} pugixml)
IF (Boost_DEFS)
TARGET_COMPILE_DEFINITIONS (${PROJECT_NAME} PUBLIC ${Boost_DEFS})
ENDIF (Boost_DEFS)
Expand Down
2 changes: 1 addition & 1 deletion src/tmx/TmxApi/tmx/messages/message_document.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <stdexcept>

#include <tmx/messages/message.hpp>
#include <tmx/pugixml/pugixml.hpp>
#include <pugixml.hpp>

namespace tmx {

Expand Down
74 changes: 0 additions & 74 deletions src/tmx/TmxApi/tmx/pugixml/pugiconfig.hpp
View file
Open in desktop

This file was deleted.

Loading
Loading