Skip to content

Commit 120e40e

Browse files
committed
BUG: Fix ctest error on ITKExpat linking in GenerateCLP testing
ITKEXPAT is no longer used and has been replaced by ITKExpat which is now included by setting the project's COMPONENTS. (work by Hans Johnson in PR #48)
1 parent 608c7b0 commit 120e40e

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

GenerateCLP/Testing/CLPExample1/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ endif()
2626
set(${PROJECT_NAME}_SOURCE ${PROJECT_NAME}.cxx)
2727
GENERATECLP(${PROJECT_NAME}_SOURCE ${PROJECT_NAME}.xml)
2828
add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCE})
29-
target_link_libraries(${PROJECT_NAME} ITKEXPAT ${_additional_link_libraries})
30-
29+
if(_additional_link_libraries)
30+
target_link_libraries(${PROJECT_NAME} ${_additional_link_libraries})
31+
endif()
3132
#-----------------------------------------------------------------------------
3233
# Test
3334
#-----------------------------------------------------------------------------

GenerateCLP/Testing/PointExample1/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ endif()
2626
set(${PROJECT_NAME}_SOURCE ${PROJECT_NAME}.cxx)
2727
GENERATECLP(${PROJECT_NAME}_SOURCE ${PROJECT_NAME}.xml)
2828
add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCE})
29-
target_link_libraries(${PROJECT_NAME} ITKEXPAT ${_additional_link_libraries})
29+
if(_additional_link_libraries)
30+
target_link_libraries(${PROJECT_NAME} ${_additional_link_libraries})
31+
endif()

GenerateCLP/Testing/Slicer3Example/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ endif()
2626
set(${PROJECT_NAME}_SOURCE ${PROJECT_NAME}.cxx)
2727
GENERATECLP(${PROJECT_NAME}_SOURCE ${PROJECT_NAME}.xml)
2828
add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCE})
29-
target_link_libraries(${PROJECT_NAME} ITKEXPAT ${_additional_link_libraries})
29+
if(_additional_link_libraries)
30+
target_link_libraries(${PROJECT_NAME} ${_additional_link_libraries})
31+
endif()
3032

3133
#-----------------------------------------------------------------------------
3234
# Test

0 commit comments

Comments
 (0)