Skip to content

Commit

Permalink
fix linking issues with VTK enabled on OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikolaus Trost committed Dec 6, 2016
1 parent 57bb06d commit 614862d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions KEMField/Source/2.0/Plugins/VTKPart2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ endif( @PROJECT_NAME@_USE_VTK )
if( @PROJECT_NAME@_USE_VTK AND @PROJECT_NAME@_USE_KGEOBAG )
list( APPEND VTK-PART2_LINK_LIBRARIES
${KGEOBAG_LIBRARIES}
KGeoBagMath
KGeoBagCore
Kommon
${VTK_LIBRARIES}

)
Expand Down
10 changes: 5 additions & 5 deletions Kommon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ if( KASPER_USE_TBB )
add_subdirectory( TBB )
endif()

# a distinct shared library "KommonVtk" is built here!
if( KASPER_USE_VTK )
add_subdirectory( Vtk )
endif()

kasper_include_default_dirs()
kasper_install_headers( ${KOMMON_HEADER_FILES} )

add_library( Kommon SHARED ${KOMMON_SOURCE_FILES} )
target_link_libraries( Kommon ${EXTERNAL_LIBRARIES} )
kasper_install_libraries( Kommon )

# a distinct shared library "KommonVtk" is built here!
if( KASPER_USE_VTK )
add_subdirectory( Vtk )
endif()

kasper_install_module()
2 changes: 1 addition & 1 deletion Kommon/Vtk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ set( KOMMON_VTK_SOURCE_FILENAMES
kasper_install_headers( ${KOMMON_VTK_HEADER_FILENAMES} )

add_library( KommonVtk SHARED ${KOMMON_VTK_SOURCE_FILENAMES} )
target_link_libraries( KommonVtk ${VTK_LIBRARIES} )
target_link_libraries( KommonVtk ${VTK_LIBRARIES} Kommon )
kasper_install_libraries( KommonVtk )

0 comments on commit 614862d

Please sign in to comment.