make voro++ proper target for easier linkage, fix ALL_Fortran linkage

CMakeLists.txt

@@ -97,8 +97,9 @@ endif(CM_ALL_USE_F08 AND MPI_Fortran_HAVE_F08_MODULE)
 if(CM_ALL_VORONOI)
     message(STATUS "compiling voro++ version in contrib/voro++")
     add_subdirectory(contrib/voro++)
-    set(CM_ALL_VORO_INC ${CMAKE_SOURCE_DIR}/contrib/voro++/include)
-    set(CM_ALL_VORO_LIB "-L${CMAKE_BINARY_DIR}/contrib/voro++/src -lvoro")
+    #    set(CM_ALL_VORO_INC contrib/voro++/include)
+    #    set(CM_ALL_VORO_LIB contrib/voro++/src)
+    #set(CM_ALL_VORO_LIB "-L${CMAKE_BINARY_DIR}/contrib/voro++/src -lvoro")
     add_compile_options("-DALL_VORONOI_ACTIVE")
 endif()
 

contrib/voro++/src/CMakeLists.txt

@@ -7,6 +7,12 @@ file (GLOB ${MODULE_NAME}_SRCS voro++.cc)
 # Create the library.
 add_library (${MODULE_NAME} ${${MODULE_NAME}_SRCS})
 
+target_include_directories(${MODULE_NAME}
+	INTERFACE
+	"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>"
+	"$<INSTALL_INTERFACE:include>")
+
 install (TARGETS ${MODULE_NAME}
+	EXPORT ALLTargets
 		ARCHIVE DESTINATION lib
 		LIBRARY DESTINATION lib)

src/CMakeLists.txt

@@ -22,8 +22,7 @@ if(CM_ALL_VTK_OUTPUT)
     target_link_libraries(ALL PUBLIC ${VTK_LIBRARIES})
 endif(CM_ALL_VTK_OUTPUT)
 if(CM_ALL_VORONOI)
-    target_include_directories(ALL PUBLIC ${CM_ALL_VORO_INC})
-    target_link_libraries(ALL PUBLIC ${CM_ALL_VORO_LIB})
+    target_link_libraries(ALL PUBLIC voro)
 endif(CM_ALL_VORONOI)
 
 target_include_directories(ALL PUBLIC ${MPI_CXX_INCLUDE_PATH})
@@ -52,17 +51,12 @@ if (CM_ALL_FORTRAN)
         target_include_directories(ALL_fortran PRIVATE ${VTK_INCLUDE_DIRS})
         target_link_libraries(ALL_fortran PRIVATE ${VTK_LIBRARIES})
     endif(CM_ALL_VTK_OUTPUT)
-    #if(CM_ALL_VORONOI)
-    #    target_include_directories(ALL_fortran PUBLIC ${CM_ALL_VORO_INC})
-    #    target_link_libraries(ALL_fortran PUBLIC ${CM_ALL_VORO_LIB})
-    #endif(CM_ALL_VORONOI)
 
     target_include_directories(ALL_fortran PUBLIC ${MPI_Fortran_INCLUDE_PATH})
     target_include_directories(ALL_fortran
-        PUBLIC
+        INTERFACE
         "$<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>"
         "$<INSTALL_INTERFACE:include/modules>")
-    target_include_directories(ALL_fortran PRIVATE ${ALL_INCLUDE_DIR})
     target_link_libraries(ALL_fortran PUBLIC ${MPI_Fortran_LINK_FLAGS} ${MPI_Fortran_LIBRARIES} ALL)
 
     install(TARGETS ALL_fortran