Skip to content

Commit 7605fa5

Browse files
committed
Update dispatcher to use namespace aliases
1 parent c3763ad commit 7605fa5

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

CMake/srcsax_event_dispatch_build.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ add_subdirectory(${DISPATCH_SOURCE_DIR}/srcSAX/CMake ${DISPATCH_BINARY_DIR}/srcS
2727
# Compiler options
2828
add_definitions("-std=c++11")
2929

30-
# find needed libraries
31-
find_package(LibXml2 REQUIRED)
32-
3330
set(DISPATCH_INCLUDE_DIR ${SRCSAX_INCLUDE_DIR}
3431
${DISPATCH_SOURCE_DIR}/src/dispatcher
3532
${DISPATCH_SOURCE_DIR}/src/policy_classes

src/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ file(GLOB DISPATCHER_HEADER dispatcher/*.hpp)
2525
file(GLOB POLICY_CLASSES_SOURCE policy_classes/*.cpp)
2626
file(GLOB POLICY_CLASSES_HEADER policy_classes/*.hpp)
2727

28+
# find needed libraries
29+
find_package(LibXml2 REQUIRED)
30+
2831
add_library(srcsaxeventdispatch ${DISPATCHER_SOURCE} ${DISPATCHER_HEADER} ${POLICY_CLASSES_SOURCE} ${POLICY_CLASSES_HEADER})
32+
target_link_libraries(srcsaxeventdispatch PRIVATE LibXml2::LibXml2)
2933

3034
install(TARGETS srcsaxeventdispatch)
3135
install(FILES ${DISPATCHER_HEADER} ${POLICY_CLASSES_HEADER} DESTINATION include/dispatch)

tests/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121

2222
file( GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Test* )
2323
include_directories(${DISPATCH_INCLUDE_DIR})
24+
message(${SOURCES})
2425

2526
add_definitions("-std=c++11")
2627

28+
find_package(LibXml2 REQUIRED)
29+
2730
foreach( testsourcefile ${SOURCES} )
2831
string( REPLACE ".cpp" "" testname ${testsourcefile} )
2932
get_filename_component(file ${testsourcefile} NAME_WE)
3033
add_executable( ${file} EXCLUDE_FROM_ALL ${testsourcefile} )
31-
target_link_libraries( ${file} srcsaxeventdispatch srcsax_static srcml ${DISPATCH_LIBRARIES} )
32-
endforeach( testsourcefile ${SOURCES} )
34+
target_link_libraries( ${file} srcsaxeventdispatch srcsax_static srcml ${DISPATCH_LIBRARIES} LibXml2::LibXml2)
35+
endforeach( testsourcefile ${SOURCES} )

0 commit comments

Comments
 (0)