2 changes: 1 addition & 1 deletion cmake/modules/FindCFITSIO.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(NOT CFITSIO_INCLUDEDIR)

if(NOT kst_cross)
include(FindPkgConfig)
pkg_check_modules(cfitsio QUIET cfitsio)
pkg_check_modules(cfitsio QUIET cfitsio)
endif()

if(CFITSIO_INCLUDEDIR AND CFITSIO_LIBRARIES)
Expand Down
109 changes: 64 additions & 45 deletions cmake/modules/FindHDF5.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,59 +13,78 @@
# * *
# ***************************************************************************

# copied from FindGsl.cmake
# copied from findnetcdf.cmake
if(NOT HDF5_INCLUDEDIR)

if(NOT HDF5_INCLUDEDIR OR HDF5_INCLUDEDIR STREQUAL "HDF5_INCLUDEDIR-NOTFOUND")
if(NOT kst_cross)
include(FindPkgConfig)
pkg_check_modules(HDF5 QUIET hdf5)
endif()

if(NOT kst_cross)
include(FindPkgConfig)
pkg_check_modules(PKGHDF5 QUIET hdf5 hdf5-cpp)
endif()
if(HDF5_INCLUDEDIR AND HDF5_LIBRARIES)
FIND_LIBRARY(HDF5_LIBRARY_CPP hdf5_c++
HINTS ${HDF5_LIBRARY_DIRS})
set(HDF5_LIBRARY_C -L${HDF5_LIBRARY_DIRS} ${HDF5_LIBRARIES} CACHE STRING "" FORCE)
else()
set(HDF5_INCLUDEDIR HDF5_INCLUDEDIR-NOTFOUND CACHE STRING "" FORCE)
FIND_PATH(HDF5_INCLUDEDIR H5Cpp.h
HINTS
ENV HDF5_DIR
PATH_SUFFIXES include/hdf5 include/hdf5/serial include
PATHS
${kst_3rdparty_dir}
~/Library/Frameworks
/Library/Frameworks
)

if(NOT PKGHDF5_LIBRARIES)
message("NO PKGHDF5_LIBRARIES found")
set(PKGHDF5_LIBRARIES hdf5_cpp)
#if (UNIX)
# list(APPEND PKGHDF5_LIBRARIES ${PKGHDF5_LIBRARIES})
#endif()
endif()
macro(find_hdf5_lib var libname)
FIND_LIBRARY(${var} ${libname}
HINTS
ENV HDF5_DIR
PATH_SUFFIXES lib hdf5/serial lib/x86_64-linux-gnu/hdf5/serial
PATHS ${kst_3rdparty_dir})
endmacro()

set(HDF5_DIR /usr/include/hdf5)
find_hdf5_lib(hdf5_c hdf5)
find_hdf5_lib(hdf5_c_debug hdf5d)
find_hdf5_lib(hdf5_cpp hdf5_c++)
find_hdf5_lib(hdf5_cpp_debug hdf5_c++d)

set(HDF5_INCLUDEDIR HDF5_INCLUDEDIR-NOTFOUND CACHE STRING "" FORCE)
find_path(HDF5_INCLUDEDIR H5Cpp.h
HINTS
ENV HDF5_DIR
PATH_SUFFIXES serial
PATHS ${kst_3rdparty_dir} ${PKGHDF5_INCLUDEDIR} ${HDF5_DIR})
if (hdf5_cpp STREQUAL "hdf5_cpp-NOTFOUND")
find_hdf5_lib(hdf5_cpp hdf5_cpp)
endif()

set(HDF5_LIBRARY_LIST)
if(kst_3rdparty_dir)
list(APPEND PKGHDF5_LIBRARIES)
endif()
foreach(it ${PKGHDF5_LIBRARIES})
set(lib lib-NOTFOUND CACHE STRING "" FORCE)
FIND_LIBRARY(lib ${it}
HINTS
ENV HDF5_DIR
PATH_SUFFIXES lib
PATHS ${kst_3rdparty_dir} ${PKGHDF5_LIBRARY_DIRS})
list(APPEND HDF5_LIBRARY_LIST ${lib})
endforeach()
set(HDF5_LIBRARIES ${HDF5_LIBRARY_LIST} CACHE STRING "" FORCE)
if(hdf5_c AND hdf5_c_debug)
set(HDF5_LIBRARY_C optimized ${hdf5_c} debug ${hdf5_c_debug} CACHE STRING "" FORCE)
endif()
if(hdf5_cpp AND hdf5_cpp_debug)
set(HDF5_LIBRARY_CPP optimized ${hdf5_cpp} debug ${hdf5_cpp_debug} CACHE STRING "" FORCE)
endif()

if(NOT MSVC)
# only msvc needs debug and release
set(HDF5_LIBRARY_C ${hdf5_c} CACHE STRING "" FORCE)
set(HDF5_LIBRARY_CPP ${hdf5_cpp} CACHE STRING "" FORCE)
endif()
endif()
endif()

if(HDF5_INCLUDEDIR AND HDF5_LIBRARIES)
set(HDF5_INCLUDE_DIR ${HDF5_INCLUDEDIR} ${HDF5_INCLUDEDIR}/..)
set(hdf5 1)
message(STATUS "Found HDF5 (for hdf5 data files):")
message(STATUS " includes : ${HDF5_INCLUDE_DIR}")
message(STATUS " libraries: ${HDF5_LIBRARIES}")
message(STATUS "THIS IS A TEST")
else()
message(STATUS "Not found: HDF5, set HDF5_DIR")
endif()
#message(STATUS "HDF5: ${HDF5_INCLUDEDIR}")
#message(STATUS "HDF5: ${HDF5_LIBRARY_C}")
#message(STATUS "HDF5: ${HDF5_LIBRARY_CPP}")
IF(HDF5_INCLUDEDIR AND HDF5_LIBRARY_C AND HDF5_LIBRARY_CPP)
SET(HDF5_LIBRARIES ${HDF5_LIBRARY_CPP} ${HDF5_LIBRARY_C})
SET(HDF5_INCLUDE_DIR ${HDF5_INCLUDEDIR})
SET(hdf5 1)
message(STATUS "Found HDF5:")
message(STATUS " includes : ${HDF5_INCLUDE_DIR}")
message(STATUS " libraries: ${HDF5_LIBRARIES}")
ELSE()
MESSAGE(STATUS "Not found: HDF5.")
MESSAGE(STATUS " If HDF5 is installed outside the CMake search path,")
MESSAGE(STATUS " set the environmental variable HDF5_DIR to the")
MESSAGE(STATUS " HDF5 install prefix.")
ENDIF()

message(STATUS "")
message(STATUS "")

4 changes: 2 additions & 2 deletions cmake/modules/FindNetcdf.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(NOT NETCDF_INCLUDEDIR)

if(NOT kst_cross)
include(FindPkgConfig)
pkg_check_modules(NETCDF QUIET netcdf)
pkg_check_modules(NETCDF QUIET netcdf)
endif()

if(NETCDF_INCLUDEDIR AND NETCDF_LIBRARIES)
Expand All @@ -29,7 +29,7 @@ else()
FIND_PATH(NETCDF_INCLUDEDIR netcdf.h
HINTS
ENV NETCDF_DIR
PATH_SUFFIXES include
PATH_SUFFIXES include
PATHS
${kst_3rdparty_dir}
~/Library/Frameworks
Expand Down
34 changes: 0 additions & 34 deletions src/plugins/filters/exponential/kstplugin_exponential.desktop
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,4 @@ X-KDE-ModuleType=Plugin
X-KDE-Library=exponential
X-Kst-Plugin-Author=williamledda
Name=Exponential Filter Data Object Plugin
Name[bs]=Exponential Filter Data Object Plugin
Name[ca]=Exponential Filter Data Object Plugin
Name[ca@valencia]=Exponential Filter Data Object Plugin
Name[de]=Exponential Filter Data Object Plugin
Name[el]=Exponential Filter Data Object Plugin
Name[en_GB]=Exponential Filter Data Object Plugin
Name[es]=Exponential Filter Data Object Plugin
Name[fr]=Exponential Filter Data Object Plugin
Name[gl]=Exponential Filter Data Object Plugin
Name[it]=Filtro esponenziale
Name[nl]=Exponential Filter Data Object Plugin
Name[pl]=Exponential Filter Data Object Plugin
Name[pt]=Exponential Filter Data Object Plugin
Name[pt_BR]=Exponential Filter Data Object Plugin
Name[sv]=Exponential Filter Data Object Plugin
Name[uk]=Exponential Filter Data Object Plugin
Name[x-test]=xxExponential Filter Data Object Pluginxx
Comment=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[bs]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[ca]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[ca@valencia]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[de]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[el]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[en_GB]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[es]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[fr]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[gl]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[it]=Implementa un filtro esponenziale per Kst.
Comment[nl]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[pl]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[pt]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[pt_BR]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[sv]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[uk]=Implements a Exponential Filter Data Object Plugin for Kst.
Comment[x-test]=xxImplements a Exponential Filter Data Object Plugin for Kst.xx
4 changes: 1 addition & 3 deletions src/plugins/filters/movingaverage/kstplugin_movingaverage.desktop
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ X-KDE-ModuleType=Plugin
X-KDE-Library=movingaverage
X-Kst-Plugin-Author=Jonathan Liu
Name=Moving Average Data Object Plugin
Name[en_GB]=Moving Average Data Object Plugin
Comment=Implements a Moving Averge Data Object Plugin for Kst.
Comment[en_GB]=Implements a Moving Averge Data Object Plugin for Kst.
Comment=Implements a Moving Average Data Object Plugin for Kst.
2 changes: 0 additions & 2 deletions src/plugins/filters/movingmedian/kstplugin_movingmedian.desktop
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ X-KDE-ModuleType=Plugin
X-KDE-Library=movingmedian
X-Kst-Plugin-Author=Jonathan Liu
Name=Moving Median Data Object Plugin
Name[en_GB]=Moving Median Data Object Plugin
Comment=Implements a Moving Median Data Object Plugin for Kst.
Comment[en_GB]=Implements a Moving Median Data Object Plugin for Kst.