summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Farago <sensej007@email.cz>2020-08-14 13:38:27 +0200
committerTomas Farago <sensej007@email.cz>2020-08-14 13:38:50 +0200
commitca32b48afd4a49426275a5837a624727f12e23fc (patch)
tree208c1287641027ddf703f134dcc81b99dc8e4d22
parent2444279f92dbc057ff503f8800a5aa98d11b5130 (diff)
downloadufo-filters-ca32b48afd4a49426275a5837a624727f12e23fc.tar.gz
ufo-filters-ca32b48afd4a49426275a5837a624727f12e23fc.tar.bz2
ufo-filters-ca32b48afd4a49426275a5837a624727f12e23fc.tar.xz
ufo-filters-ca32b48afd4a49426275a5837a624727f12e23fc.zip
Don't force non-dash task names
-rw-r--r--contrib/CMakeLists.txt3
-rw-r--r--contrib/meson.build4
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/meson.build26
4 files changed, 14 insertions, 22 deletions
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 5566941..10cfdc2 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -72,8 +72,7 @@ foreach(_src ${contrib_sxc_filter_SRCS})
string(REGEX REPLACE "ufo-([^ \\.]+)-task.*" "\\1" task "${_src}")
# build string to get miscalleanous sources
- string(REPLACE "-" "_" _misc ${task})
- string(TOUPPER ${_misc} _misc_upper)
+ set(target "ufofilter${task}")
# create an option name and add this to disable filters
set(_misc "${_misc}_misc_SRCS")
diff --git a/contrib/meson.build b/contrib/meson.build
index 80da0db..22b638a 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -13,9 +13,7 @@ kernels = [
]
foreach plugin: plugins
- name = ''.join(plugin.split('-'))
-
- shared_module(name,
+ shared_module(plugin,
sources: ['ufo-@0@-task.c'.format(plugin), 'ufo-sxc-common.c'],
dependencies: deps,
name_prefix: 'libufofilter',
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index adea666..5fcafca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -314,8 +314,7 @@ foreach(_src ${ufofilter_SRCS})
set(_aux_src "${_aux}_aux_SRCS")
set(_aux_libs "${_aux}_aux_LIBS")
- string(REPLACE "-" "" _targetname ${task})
- set(target "ufofilter${_targetname}")
+ set(target "ufofilter${task}")
# build single shared library per filter
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/src/meson.build b/src/meson.build
index 7676848..28054c6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -135,9 +135,7 @@ configure_file(
# standard plugins
foreach plugin: plugins
- name = ''.join(plugin.split('-'))
-
- shared_module(name,
+ shared_module(plugin,
'ufo-@0@-task.c'.format(plugin),
dependencies: deps,
name_prefix: 'libufofilter',
@@ -148,7 +146,7 @@ endforeach
# generalized backproject and conebeam
-shared_module('generalbackproject',
+shared_module('general-backproject',
sources: [
'ufo-general-backproject-task.c',
'common/ufo-conebeam.c',
@@ -162,10 +160,11 @@ shared_module('generalbackproject',
install_dir: plugin_install_dir,
)
-shared_module('conebeamprojectionweight',
+shared_module('cone-beam-projection-weight',
sources: [
'ufo-cone-beam-projection-weight-task.c',
- 'common/ufo-conebeam.c'
+ 'common/ufo-conebeam.c',
+ 'common/ufo-scarray.c',
],
dependencies: deps,
name_prefix: 'libufofilter',
@@ -175,7 +174,7 @@ shared_module('conebeamprojectionweight',
# non local means
-shared_module('nonlocalmeans',
+shared_module('non-local-means',
sources: [
'ufo-non-local-means-task.c',
'common/ufo-math.c',
@@ -189,7 +188,7 @@ shared_module('nonlocalmeans',
# find large spots
-shared_module('findlargespots',
+shared_module('find-large-spots',
sources: [
'ufo-find-large-spots-task.c',
'common/ufo-math.c',
@@ -221,9 +220,7 @@ if have_clfft or with_oclfft
)
foreach plugin: fft_plugins
- name = ''.join(plugin.split('-'))
-
- shared_module(name,
+ shared_module(plugin,
'ufo-@0@-task.c'.format(plugin),
dependencies: deps,
name_prefix: 'libufofilter',
@@ -239,7 +236,7 @@ endif
python = find_program('python', required: false)
if python.found()
- shared_module('laminobackproject',
+ shared_module('lamino-backproject',
sources: ['ufo-lamino-backproject-task.c'],
dependencies: deps,
name_prefix: 'libufofilter',
@@ -307,7 +304,7 @@ endif
# cvshow
if opencv_dep.found()
- shared_module('cvshow',
+ shared_module('cv-show',
sources: ['writers/ufo-writer.c', 'ufo-cv-show-task.cpp'],
dependencies: deps + [opencv_dep],
name_prefix: 'libufofilter',
@@ -342,9 +339,8 @@ endif
if zmq_dep.found() and json_dep.found()
foreach plugin: zmq_plugins
- name = ''.join(plugin.split('-'))
- shared_module(name,
+ shared_module(plugin,
'ufo-@0@-task.c'.format(plugin),
dependencies: deps + [zmq_dep, json_dep],
name_prefix: 'libufofilter',