From 614862d1916683e1dbe7f664ebb5b0fd15904f21 Mon Sep 17 00:00:00 2001 From: Nikolaus Trost Date: Tue, 6 Dec 2016 11:33:14 +0100 Subject: [PATCH] fix linking issues with VTK enabled on OSX --- KEMField/Source/2.0/Plugins/VTKPart2/CMakeLists.txt | 3 +++ Kommon/CMakeLists.txt | 10 +++++----- Kommon/Vtk/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/KEMField/Source/2.0/Plugins/VTKPart2/CMakeLists.txt b/KEMField/Source/2.0/Plugins/VTKPart2/CMakeLists.txt index 24066b58f..55564f2c8 100644 --- a/KEMField/Source/2.0/Plugins/VTKPart2/CMakeLists.txt +++ b/KEMField/Source/2.0/Plugins/VTKPart2/CMakeLists.txt @@ -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} ) diff --git a/Kommon/CMakeLists.txt b/Kommon/CMakeLists.txt index 3bf40c55c..cbe4b819f 100644 --- a/Kommon/CMakeLists.txt +++ b/Kommon/CMakeLists.txt @@ -80,11 +80,6 @@ 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} ) @@ -92,4 +87,9 @@ 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() diff --git a/Kommon/Vtk/CMakeLists.txt b/Kommon/Vtk/CMakeLists.txt index 18b4566f5..fe2769d84 100644 --- a/Kommon/Vtk/CMakeLists.txt +++ b/Kommon/Vtk/CMakeLists.txt @@ -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 )