Use the CMake INTERFACE_INCLUDE_DIRECTORIES feature

.travis.yml

@@ -1,3 +1,8 @@
+# We need a newer version of CMake than is installed on Ubuntu 12.04
+# Therefore request to use Ubuntu 14.04 instead
+dist: trusty
+sudo: false
+
 language: c
 
 cache: ccache

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.3 FATAL_ERROR)
+cmake_minimum_required (VERSION 2.8.11 FATAL_ERROR)
 project (SAXSVIEW C CXX)
 
 set (CMAKE_VERBOSE_MAKEFILE         OFF)

ChangeLog

@@ -1,3 +1,7 @@
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * CMakeLists.txt: Require minimum CMake 2.8.11 (for INTERFACE_INCLUDE_DIRECTORIES)
+
 2015-07-08  Daniel Franke  <[email protected]>
 
 	* external/h5zlz4: New subdirectory; LZ4 comporession for HDF5.

external/cbflib/CMakeLists.txt

@@ -1,13 +1,5 @@
 project (CBFLIB C)
 
-set (CBFLIB_HEADERS cbf.h cbf_alloc.h cbf_ascii.h cbf_binary.h
-                    cbf_byte_offset.h cbf_canonical.h cbf_codes.h
-                    cbf_compress.h cbf_context.h cbf_file.h cbf_lex.h
-                    cbf_packed.h cbf_predictor.h cbf_read_binary.h
-                    cbf_read_mime.h cbf_simple.h cbf_string.h cbf_stx.h
-                    cbf_tree.h cbf_uncompressed.h cbf_write.h
-                    cbf_write_binary.h global.h md5.h)
-
 set (CBFLIB_SOURCES cbf.c cbf_alloc.c cbf_ascii.c cbf_binary.c
                     cbf_byte_offset.c cbf_canonical.c cbf_codes.c
                     cbf_compress.c cbf_context.c cbf_file.c cbf_lex.c
@@ -17,9 +9,10 @@ set (CBFLIB_SOURCES cbf.c cbf_alloc.c cbf_ascii.c cbf_binary.c
                     cbf_write_binary.c md5c.c)
 
 add_shared_library (cbf
-                    SOURCES ${CBFLIB_HEADERS} ${CBFLIB_SOURCES}
+                    SOURCES ${CBFLIB_SOURCES}
                     LIBRARIES m
                     VERSION 0.7.9.1)
+target_include_directories(cbf PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
 install_library (TARGETS cbf)
 

external/cbflib/ChangeLog

@@ -1,3 +1,7 @@
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * CMakeLists.txt: Use target_include_directories etc
+
 2012-04-11  Daniel Franke  <[email protected]>
 
 	* CMakeLists.txt: Use saxsview-convenience macros.

external/edfpack/CMakeLists.txt

@@ -4,23 +4,16 @@ find_package (ZLIB QUIET)
 if (ZLIB_FOUND)
   project (EDFPACK C)
 
-  set (EDFPACK_HEADERS angle.h arc.h bslio.h edfio.h filename.h gamma.h
-                       gauss.h ipol.h isotime.h numio.h poisson.h polarization.h
-                       project.h readascii.h reference.h waxs.h statfunc.h
-                       rot3d.h tilt3d.h sx.h strlib.h raster.h cmpr.h r2t.h)
-
-
   set (EDFPACK_SOURCES angle.c arc.c bslio.c edfio.c filename.c gamma.c
                        gauss.c ipol.c isotime.c numio.c poisson.c polarization.c
                        project.c readascii.c waxs.c r2t.c rot3d.c tilt3d.c
                        sx.c strlib.c raster.c cmpr.c statfunc.c)
 
-  include_directories(${ZLIB_INCLUDE_DIRS})
+  add_library(edf SHARED ${EDFPACK_SOURCES})
+  set_target_properties(edf PROPERTIES VERSION 2.233)
+  target_link_libraries(edf PRIVATE m ${ZLIB_LIBRARIES})
+  target_include_directories(edf PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
-  add_shared_library (edf
-                      SOURCES ${EDFPACK_HEADERS} ${EDFPACK_SOURCES}
-                      LIBRARIES m ${ZLIB_LIBRARIES}
-                      VERSION 2.233)
   install_library (TARGETS edf)
 
 else (ZLIB_FOUND)

external/edfpack/ChangeLog

@@ -1,3 +1,7 @@
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * CMakeLists.txt: Use target_include_directories etc
+
 2014-04-07  Daniel Franke  <[email protected]>
 
 	* Imported r269 of edfpack.

external/h5zlz4/CMakeLists.txt

@@ -8,16 +8,19 @@ find_file (HDF5_PLUGIN_HEADER
            NO_DEFAULT_PATH)
 if (HDF5_FOUND AND (NOT HDF5_PLUGIN_HEADER STREQUAL "HDF5_PLUGIN_HEADER-NOTFOUND"))
   project (H5ZLZ4 C)
-  include_directories(${HDF5_INCLUDE_DIRS})
 
-  set (H5ZLZ4_HEADERS lz4.h)
   set (H5ZLZ4_SOURCES lz4.c h5zlz4.c)
 
-  add_definitions (-DHAVE_HDF5 -std=gnu99)
-  add_shared_library (h5zlz4
-                      SOURCES ${H5ZLZ4_HEADERS} ${H5ZLZ4_SOURCES}
-                      LIBRARIES ${HDF5_LIBRARIES}
-                      VERSION 0.2)
+  add_library(h5zlz4 SHARED ${H5ZLZ4_SOURCES})
+  set_target_properties(h5zlz4 PROPERTIES VERSION 0.2)
+  if (CMAKE_VERSION VERSION_LESS 3.1)
+    target_compile_options(h5zlz4 PRIVATE --std=gnu99)
+  else()
+    set_target_properties(h5zlz4 PROPERTIES C_STANDARD 99)
+  endif()
+
+  target_link_libraries(h5zlz4 PUBLIC ${HDF5_LIBRARIES})
+  target_include_directories(h5zlz4 PUBLIC ${HDF5_INCLUDE_DIRS})
 
   install_library (TARGETS h5zlz4)
 endif (HDF5_FOUND AND (NOT HDF5_PLUGIN_HEADER STREQUAL "HDF5_PLUGIN_HEADER-NOTFOUND"))

external/h5zlz4/ChangeLog

@@ -1,10 +1,14 @@
-2016-07-22  Chris Kerr  <[email protected]>
+2016-07-22  Chris Kerr  <[email protected]>
 
-        * CMakeLists.txt: Add HDF5_INCLUDE_DIRS to include_directories()
+        * CMakeLists.txt: Set target_include_directories appropriately
+
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * CMakeLists.txt: Set target_link_libraries appropriately
 
 2015-07-13  Chris Kerr  <[email protected]>
 
-        * CMakeLists.txt: Check for a sufficiently recent version of HDF5
+	* CMakeLists.txt: Check for a sufficiently recent version of HDF5
 
 2015-07-08  Daniel Franke  <[email protected]>
 

external/muparser/CMakeLists.txt

@@ -1,20 +1,6 @@
 
 project (MUPARSER CXX)
 
-set (MUPARSER_HEADERS muParserBase.h
-                      muParserBytecode.h
-                      muParserCallback.h
-                      muParserDef.h
-                      muParserDLL.h
-                      muParserError.h
-                      muParserFixes.h
-                      muParser.h
-                      muParserInt.h
-                      muParserStack.h
-                      muParserTemplateMagic.h
-                      muParserToken.h
-                      muParserTokenReader.h)
-
 set (MUPARSER_SOURCES muParserBase.cpp
                       muParserBytecode.cpp
                       muParserCallback.cpp
@@ -24,10 +10,12 @@ set (MUPARSER_SOURCES muParserBase.cpp
                       muParserInt.cpp
                       muParserTokenReader.cpp)
 
-add_definitions (-DMUPARSERLIB_EXPORTS -DMUPARSER_DLL)
 
 add_shared_library (muparser
-                    SOURCES ${MUPARSER_SOURCES} ${MUPARSER_HEADERS}
+                    SOURCES ${MUPARSER_SOURCES}
                     VERSION 2.2.2)
 
+target_compile_definitions (muparser PRIVATE MUPARSERLIB_EXPORTS MUPARSER_DLL)
+target_include_directories (muparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+
 install_library (TARGETS muparser)

external/muparser/ChangeLog

@@ -1,3 +1,7 @@
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * CMakeLists.txt: Use target_include_directories etc
+
 2012-04-11  Daniel Franke  <[email protected]>
 
         * CMakeLists.txt: Use saxsview-convenience macros.

external/qtsolutions/ChangeLog

@@ -1,3 +1,7 @@
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * qtpropertybrowser/CMakeLists.txt: Use target_include_directories etc
+
 2012-04-11  Daniel Franke  <[email protected]>
 
         * qtpropertybrowser/CMakeLists.txt: Use saxsview-convenience macros.

external/qtsolutions/qtpropertybrowser/CMakeLists.txt

@@ -1,16 +1,5 @@
 project (QTPROPERTYBROWSER CXX)
 
-include_directories (${QTPROPERTYBROWSER_BINARY_DIR})
-
-set (HEADERS qtbuttonpropertybrowser.h
-             qtpropertybrowser.h
-             qttreepropertybrowser.h
-             qteditorfactory.h
-             qtpropertybrowserutils_p.h
-             qtvariantproperty.h
-             qtgroupboxpropertybrowser.h
-             qtpropertymanager.h)
-
 set (SOURCES qtbuttonpropertybrowser.cpp
              qtpropertybrowser.cpp
              qttreepropertybrowser.cpp
@@ -62,9 +51,11 @@ qt4_add_resources (RES qtpropertybrowser.qrc)
 
 
 add_shared_library (qtpropertybrowser
-                    SOURCES ${HEADERS} ${SOURCES} ${RES} moc_qtpropertybrowserutils_p.cpp
+                    SOURCES ${SOURCES} ${RES} moc_qtpropertybrowserutils_p.cpp
                     LIBRARIES ${QT_LIBRARIES}
                     VERSION 2.5.1)
+target_include_directories(qtpropertybrowser PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}"
+                                             PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 
 install_library (TARGETS qtpropertybrowser)
 

external/qwt/CMakeLists.txt

@@ -1,50 +1,5 @@
 project (QWT CXX)
 
-qt4_wrap_cpp (MOC qwt_abstract_slider.h qwt_analog_clock.h qwt_compass.h
-                  qwt_counter.h qwt_dial.h qwt_dyngrid_layout.h qwt_knob.h
-                  qwt_legend.h qwt_magnifier.h
-                  qwt_panner.h qwt_picker.h qwt_plot.h qwt_plot_canvas.h
-                  qwt_plot_magnifier.h qwt_plot_panner.h qwt_plot_picker.h
-                  qwt_plot_zoomer.h qwt_scale_widget.h qwt_slider.h
-                  qwt_text_label.h qwt_thermo.h qwt_wheel.h
-                  qwt_plot_renderer.h qwt_sampling_thread.h
-                  qwt_abstract_legend.h qwt_legend_label.h
-                  qwt_abstract_scale.h)
-
-set (HEADERS qwt.h qwt_dial_needle.h qwt_plot_magnifier.h
-             qwt_scale_div.h qwt_abstract_scale.h qwt_plot_abstract_barchart.h
-             qwt_painter.h qwt_plot_marker.h qwt_scale_draw.h
-             qwt_abstract_scale_draw.h qwt_panner.h
-             qwt_plot_panner.h qwt_scale_engine.h qwt_abstract_slider.h
-             qwt_picker.h qwt_plot_picker.h qwt_scale_map.h
-             qwt_analog_clock.h qwt_dyngrid_layout.h qwt_picker_machine.h
-             qwt_scale_widget.h 
-             qwt_event_pattern.h qwt_plot.h qwt_plot_rasteritem.h
-             qwt_series_data.h qwt_arrow_button.h qwt_global.h
-             qwt_plot_canvas.h qwt_plot_rescaler.h qwt_slider.h qwt_clipper.h
-             qwt_interval_symbol.h qwt_plot_curve.h qwt_plot_scaleitem.h
-             qwt_spline.h qwt_color_map.h qwt_knob.h qwt_plot_dict.h
-             qwt_plot_seriesitem.h qwt_symbol.h qwt_column_symbol.h
-             qwt_plot_directpainter.h
-             qwt_plot_spectrogram.h qwt_text.h qwt_compass.h qwt_legend.h
-             qwt_plot_grid.h qwt_plot_svgitem.h qwt_text_engine.h
-             qwt_compass_rose.h qwt_plot_histogram.h
-             qwt_plot_zoomer.h qwt_text_label.h qwt_counter.h
-             qwt_plot_intervalcurve.h
-             qwt_thermo.h qwt_curve_fitter.h qwt_magnifier.h qwt_plot_item.h
-             qwt_raster_data.h qwt_dial.h qwt_math.h
-             qwt_plot_layout.h qwt_round_scale_draw.h qwt_wheel.h
-             qwt_plot_renderer.h qwt_sampling_thread.h 
-             qwt_plot_spectrocurve.h qwt_system_clock.h qwt_compat.h
-             qwt_abstract_legend.h qwt_graphic.h qwt_interval.h qwt_legend_data.h
-             qwt_legend_label.h qwt_matrix_raster_data.h qwt_null_paintdevice.h
-             qwt_painter_command.h qwt_pixel_matrix.h qwt_plot_barchart.h
-             qwt_plot_legenditem.h qwt_plot_multi_barchart.h qwt_plot_tradingcurve.h
-             qwt_point_3d.h qwt_point_data.h qwt_point_mapper.h qwt_point_polar.h
-             qwt_samples.h qwt_series_store.h qwt_date.h qwt_date_scale_engine.h
-             qwt_widget_overlay.h qwt_plot_zoneitem.h qwt_transform.h
-             qwt_plot_shapeitem.h qwt_date_scale_draw.h qwt_plot_textlabel.h)
-
 
 set (SOURCES qwt_abstract_scale.cpp qwt qwt_plot_abstract_barchart.cpp
              qwt_picker_machine.cpp qwt_plot_picker.cpp qwt_scale_engine.cpp
@@ -81,11 +36,12 @@ set (SOURCES qwt_abstract_scale.cpp qwt qwt_plot_abstract_barchart.cpp
              qwt_date_scale_draw.cpp qwt_date_scale_engine.cpp
              qwt_transform.cpp qwt_date.cpp qwt_plot_textlabel.cpp)
 
-add_definitions (-DQWT_NO_OPENGL)
-
 add_shared_library(qwt
-                   SOURCES ${HEADERS} ${SOURCES} ${MOC}
+                   SOURCES ${SOURCES}
                    LIBRARIES ${QT_LIBRARIES}
                    VERSION 6.1.0)
+set_target_properties(qwt PROPERTIES AUTOMOC On)
+target_compile_definitions(qwt PRIVATE QWT_NO_OPENGL)
+target_include_directories(qwt PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
 install_library(TARGETS qwt)

external/qwt/ChangeLog

@@ -1,3 +1,11 @@
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * CMakeLists.txt: Use AUTOMOC
+
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * CMakeLists.txt: Use target_include_directories etc
+
 2013-04-19  Daniel Franke  <[email protected]>
 
 	* patches/003-legend-item-testattribute.patch: Updated.

external/tiff/CMakeLists.txt

@@ -3,7 +3,6 @@ find_package (TIFF)
 
 if (TIFF_FOUND)
   set (LIBTIFF_LIBRARIES   ${TIFF_LIBRARY}     CACHE FILEPATH "")
-  set (LIBTIFF_INCLUDE_DIR ${TIFF_INCLUDE_DIR} CACHE PATH     "")
 
 else (TIFF_FOUND)
 
@@ -22,9 +21,6 @@ else (TIFF_FOUND)
                        tif_dirread.c tif_dirinfo.c tif_dir.c tif_compress.c
                        tif_color.c tif_codec.c tif_close.c tif_aux.c)
 
-  set (LIBTIFF_HEADERS t4.h	tif_dir.h tiff.h tiffio.h uvcode.h
-                       tif_fax3.h tiffiop.h tif_predict.h tiffvers.h)
-
   set (LIBTIFF_EXTRA_LIBS)
 
   if (JPEG_FOUND)
@@ -52,18 +48,15 @@ else (TIFF_FOUND)
     configure_file (tif_config.apple.h tif_config.h COPYONLY)
     configure_file (tiffconf.apple.h tiffconf.h COPYONLY)
 
-	# Use tif_unix.c, not tif_apple.c, the latter results in
-	# some strange compile errors?! Works anyway.
+    # Use tif_unix.c, not tif_apple.c, the latter results in
+    # some strange compile errors?! Works anyway.
     set(LIBTIFF_SOURCES ${LIBTIFF_SOURCES} tif_unix.c)
     set (LIBTIFF_HEADERS ${LIBTIFF_HEADERS} tif_config.h)
 
   elseif (UNIX)
     set (LIBTIFF_SOURCES ${LIBTIFF_SOURCES} tif_unix.c)
   endif(WIN32)
 
-
-  include_directories (${LIBTIFF_BINARY_DIR})
-
   #
   # This target should be called 'tiff', but on MacOS, while there is no system
   # libtiff cmake could find, there is libTIFF in the ApplicationServices framework
@@ -72,14 +65,15 @@ else (TIFF_FOUND)
   # this libtiff libtiff3 instead and all works.
   #
   add_shared_library (tiff3
-                      SOURCES ${LIBTIFF_HEADERS} ${LIBTIFF_SOURCES}
+                      SOURCES   ${LIBTIFF_SOURCES}
                       LIBRARIES ${LIBTIFF_EXTRA_LIBS}
                       VERSION 3.9.6)
+  target_include_directories(tiff3 PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}"
+                                   PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 
   install_library (TARGETS tiff3)
 
-  set (LIBTIFF_LIBRARIES   tiff3                                       CACHE FILEPATH "")
-  set (LIBTIFF_INCLUDE_DIR ${LIBTIFF_SOURCE_DIR} ${LIBTIFF_BINARY_DIR} CACHE PATH     "")
+  set (LIBTIFF_LIBRARIES   tiff3               CACHE FILEPATH "")
 
 endif (TIFF_FOUND)
 

external/tiff/ChangeLog

@@ -1,3 +1,8 @@
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * CMakeLists.txt: Use target_include_directories etc
+                          find_package(TIFF) already sets this property on the found TIFF library
+
 2012-07-09  Daniel Franke  <[email protected]>
 
 	* tif_config.win32.h: New.

libsaxsdocument/ChangeLog

@@ -1,3 +1,11 @@
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * fortran/CMakeLists.txt: Add INTERFACE_INCLUDE_DIRECTORY for the Fortran module output directory
+
+2016-07-07  Chris Kerr  <[email protected]>
+
+        * src/CMakeLists.txt: Use target_include_directories etc
+
 2016-02-24  Chris Kerr  <[email protected]>
 
         * src/CMakeLists.txt: Disable libxml2 on Windows

libsaxsdocument/fortran/CMakeLists.txt

@@ -6,5 +6,10 @@ if (CMAKE_Fortran_COMPILER_WORKS)
                       SOURCES fsaxsdocument.f90
                       LIBRARIES saxsdocument)
 
+  if (DEFINED CMAKE_Fortran_MODULE_DIRECTORY)
+    target_include_directories(fsaxsdocument INTERFACE "${CMAKE_Fortran_MODULE_DIRECTORY}")
+  else()
+    target_include_directories(fsaxsdocument INTERFACE "${CMAKE_CURRENT_BINARY_DIR}")
+  endif()
 endif (CMAKE_Fortran_COMPILER_WORKS)
 

libsaxsdocument/python/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 if (PYTHONLIBS_FOUND)
-  include_directories (${LIBSAXSDOCUMENT_SOURCE_DIR})
 
   add_python_module (pysaxsdocument
                      SOURCES pysaxsdocument.c