cmake: add major version to files/dirs

mltframework · Mar 10, 2021 · d56f8e4 · d56f8e4
1 parent 3ae868d
commit d56f8e4
Show file tree

Hide file tree

Showing 35 changed files with 112 additions and 86 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,6 +83,13 @@ else()
   file(CREATE_LINK "${CMAKE_SOURCE_DIR}/profiles" "${MLT_DATA_OUTPUT_DIRECTORY}/profiles" SYMBOLIC)
 endif()
 
+set(MLT_INSTALL_MODULE_DIR ${CMAKE_INSTALL_LIBDIR}/mlt)
+set(MLT_INSTALL_DATA_DIR ${CMAKE_INSTALL_DATADIR}/mlt)
+if(NOT (WIN32 OR APPLE))
+  set(MLT_INSTALL_MODULE_DIR ${CMAKE_INSTALL_LIBDIR}/mlt-${MLT_VERSION_MAJOR})
+  set(MLT_INSTALL_DATA_DIR ${CMAKE_INSTALL_DATADIR}/mlt-${MLT_VERSION_MAJOR})
+endif()
+
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_C_EXTENSIONS ON)
@@ -309,10 +316,13 @@ if(BUILD_DOCS)
   doxygen_add_docs(docs src/framework)
 endif()
 
-install(DIRECTORY presets profiles DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt)
+install(DIRECTORY presets profiles DESTINATION ${MLT_INSTALL_DATA_DIR})
 
 if(UNIX AND NOT APPLE)
-  install(FILES docs/melt.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+  install(FILES docs/melt.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 RENAME melt-${MLT_VERSION_MAJOR}.1)
+  install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
+                ${CMAKE_INSTALL_FULL_MANDIR}/man1/melt-${MLT_VERSION_MAJOR}.1 ${CMAKE_INSTALL_FULL_MANDIR}/man1/melt.1)"
+  )
 endif()
 
 add_subdirectory(src)
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14)
 project(MLT-examples)
 
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(mlt++ REQUIRED IMPORTED_TARGET mlt++)
+pkg_check_modules(mlt++ REQUIRED IMPORTED_TARGET mlt++-7)
 
 add_executable(play play.cpp)
 target_link_libraries(play PRIVATE PkgConfig::mlt++)
diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
@@ -38,13 +38,16 @@ target_link_libraries(mlt PRIVATE m Threads::Threads ${CMAKE_DL_LIBS})
 
 target_include_directories(mlt PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/mlt>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/mlt-${MLT_VERSION_MAJOR}>
 )
 
-set_target_properties(mlt PROPERTIES SOVERSION ${MLT_VERSION_MAJOR} VERSION ${MLT_VERSION})
+set_target_properties(mlt PROPERTIES
+  VERSION 1.${MLT_VERSION_MINOR}.${MLT_VERSION_PATCH}
+  SOVERSION 1
+  OUTPUT_NAME mlt-${MLT_VERSION_MAJOR}
+)
 
 if(WIN32)
-  set_target_properties(mlt PROPERTIES OUTPUT_NAME "mlt-${MLT_VERSION_MAJOR}")
   if(MINGW)
     install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt-${MLT_VERSION_MAJOR}.dll"
       DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -61,7 +64,7 @@ endif()
 if(NOT (WIN32 OR APPLE))
   target_compile_definitions(mlt PRIVATE
     $<BUILD_INTERFACE:PREFIX_DATA="${MLT_DATA_OUTPUT_DIRECTORY}" PREFIX_LIB="${MLT_MODULE_OUTPUT_DIRECTORY}">
-    $<INSTALL_INTERFACE:PREFIX_DATA="${CMAKE_INSTALL_FULL_DATADIR}/mlt" PREFIX_LIB="${CMAKE_INSTALL_FULL_LIBDIR}/mlt">
+    $<INSTALL_INTERFACE:PREFIX_DATA="${CMAKE_INSTALL_FULL_DATADIR}/mlt-${MLT_VERSION_MAJOR}" PREFIX_LIB="${CMAKE_INSTALL_FULL_LIBDIR}/mlt-${MLT_VERSION_MAJOR}">
   )
   target_link_options(mlt PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/mlt.vers)
   set_target_properties(mlt PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/mlt.vers)
@@ -109,13 +112,13 @@ install(TARGETS mlt
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mlt/framework
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mlt-${MLT_VERSION_MAJOR}/framework
 )
 
-install(FILES metaschema.yaml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt)
+install(FILES metaschema.yaml DESTINATION ${MLT_INSTALL_DATA_DIR})
 
-configure_file(mlt-framework.pc.in mlt-framework.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mlt-framework.pc
+configure_file(mlt-framework.pc.in mlt-framework-${MLT_VERSION_MAJOR}.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mlt-framework-${MLT_VERSION_MAJOR}.pc
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
   COMPONENT Development
 )
diff --git a/src/framework/mlt-framework.pc.in b/src/framework/mlt-framework.pc.in
@@ -4,12 +4,12 @@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 datadir=@CMAKE_INSTALL_FULL_DATADIR@
 
-moduledir=${libdir}/mlt
-mltdatadir=${datadir}/mlt
+moduledir=${libdir}/mlt-@MLT_VERSION_MAJOR@
+mltdatadir=${datadir}/mlt-@MLT_VERSION_MAJOR@
 
 Name: mlt-framework
 Description: MLT multimedia framework
 Version: @MLT_VERSION@
 Requires:
-Libs: -L${libdir} -lmlt
-Cflags: -I${includedir} -I${includedir}/mlt
+Libs: -L${libdir} -lmlt-@MLT_VERSION_MAJOR@
+Cflags: -I${includedir}/mlt-@MLT_VERSION_MAJOR@
diff --git a/src/melt/CMakeLists.txt b/src/melt/CMakeLists.txt
@@ -19,4 +19,11 @@ if(MINGW)
   target_link_options(melt PRIVATE -mconsole)
 endif()
 
-install(TARGETS melt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+if(WIN32 OR APPLE)
+  install(TARGETS melt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+else()
+  install(PROGRAMS "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/melt" DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME melt-${MLT_VERSION_MAJOR})
+  install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \
+                ${CMAKE_INSTALL_FULL_BINDIR}/melt-${MLT_VERSION_MAJOR} ${CMAKE_INSTALL_FULL_BINDIR}/melt)"
+  )
+endif()
diff --git a/src/mlt++/CMakeLists.txt b/src/mlt++/CMakeLists.txt
@@ -34,13 +34,16 @@ target_link_libraries(mlt++ PUBLIC mlt)
 
 target_include_directories(mlt++ PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/mlt++>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/mlt-${MLT_VERSION_MAJOR}/mlt++>
 )
 
-set_target_properties(mlt++ PROPERTIES SOVERSION ${MLT_VERSION_MAJOR} VERSION ${MLT_VERSION})
+set_target_properties(mlt++ PROPERTIES
+  VERSION 1.${MLT_VERSION_MINOR}.${MLT_VERSION_PATCH}
+  SOVERSION 1
+  OUTPUT_NAME mlt++-${MLT_VERSION_MAJOR}
+)
 
 if(WIN32)
-  set_target_properties(mlt++ PROPERTIES OUTPUT_NAME "mlt++-${MLT_VERSION_MAJOR}")
   if(MINGW)
     install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt++-${MLT_VERSION_MAJOR}.dll"
       DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -93,11 +96,11 @@ install(TARGETS mlt++
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mlt++
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mlt-${MLT_VERSION_MAJOR}/mlt++
 )
 
-configure_file(mlt++.pc.in mlt++.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mlt++.pc
+configure_file(mlt++.pc.in mlt++-${MLT_VERSION_MAJOR}.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mlt++-${MLT_VERSION_MAJOR}.pc
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
   COMPONENT Development
 )
diff --git a/src/mlt++/mlt++.pc.in b/src/mlt++/mlt++.pc.in
@@ -7,6 +7,6 @@ datadir=@CMAKE_INSTALL_FULL_DATADIR@
 Name: mlt++
 Description: C++ API for MLT multimedia framework
 Version: @MLT_VERSION@
-Requires: mlt-framework
-Libs: -L${libdir} -lmlt++
-Cflags: -I${includedir} -I${includedir}/mlt++
+Requires: mlt-framework-@MLT_VERSION_MAJOR@
+Libs: -L${libdir} -lmlt++-@MLT_VERSION_MAJOR@
+Cflags: -I${includedir}/mlt-@MLT_VERSION_MAJOR@/mlt++
diff --git a/src/modules/avformat/CMakeLists.txt b/src/modules/avformat/CMakeLists.txt
@@ -52,13 +52,13 @@ endif()
 
 set_target_properties(mltavformat PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltavformat LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltavformat LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   consumer_avformat.yml
   producer_avformat.yml
   resolution_scale.yml
   blacklist.txt
   yuv_only.txt
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/avformat
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/avformat
 )
diff --git a/src/modules/core/CMakeLists.txt b/src/modules/core/CMakeLists.txt
@@ -62,7 +62,7 @@ endif()
 
 set_target_properties(mltcore PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltcore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltcore LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   consumer_multi.yml
@@ -104,5 +104,5 @@ install(FILES
   transition_region.yml
   loader.dict
   loader.ini
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/core
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/core
 )
diff --git a/src/modules/decklink/CMakeLists.txt b/src/modules/decklink/CMakeLists.txt
@@ -24,10 +24,10 @@ endif()
 
 set_target_properties(mltdecklink PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltdecklink LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltdecklink LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   consumer_decklink.yml
   producer_decklink.yml
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/decklink
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/decklink
 )
diff --git a/src/modules/frei0r/CMakeLists.txt b/src/modules/frei0r/CMakeLists.txt
@@ -13,12 +13,12 @@ target_link_libraries(mltfrei0r PRIVATE mlt m ${CMAKE_DL_LIBS})
 
 set_target_properties(mltfrei0r PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltfrei0r LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltfrei0r LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   filter_cairoblend_mode.yml
   resolution_scale.yml
   param_name_map.yaml
   blacklist.txt not_thread_safe.txt
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/frei0r
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/frei0r
 )
diff --git a/src/modules/gdk/CMakeLists.txt b/src/modules/gdk/CMakeLists.txt
@@ -20,7 +20,7 @@ if(TARGET PkgConfig::pango AND TARGET PkgConfig::fontconfig)
   target_sources(mltgdk PRIVATE producer_pango.c)
   target_link_libraries(mltgdk PRIVATE PkgConfig::pango PkgConfig::fontconfig PkgConfig::pangoft2)
   target_compile_definitions(mltgdk PRIVATE USE_PANGO)
-  install(FILES producer_pango.yml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/gdk)
+  install(FILES producer_pango.yml DESTINATION ${MLT_INSTALL_DATA_DIR}/gdk)
 endif()
 
 if(CPU_MMX)
@@ -34,6 +34,6 @@ endif()
 
 set_target_properties(mltgdk PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltgdk LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltgdk LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
-install(FILES filter_rescale.yml producer_pixbuf.yml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/gdk)
+install(FILES filter_rescale.yml producer_pixbuf.yml DESTINATION ${MLT_INSTALL_DATA_DIR}/gdk)
diff --git a/src/modules/jackrack/CMakeLists.txt b/src/modules/jackrack/CMakeLists.txt
@@ -24,12 +24,12 @@ if(GPL AND TARGET PkgConfig::xml AND TARGET PkgConfig::glib AND ladspa_h_FOUND)
     filter_jack.yml
     filter_ladspa.yml
     producer_ladspa.yml
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/jackrack
+    DESTINATION ${MLT_INSTALL_DATA_DIR}/jackrack
   )
 endif()
 
 set_target_properties(mltjack PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltjack LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltjack LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
-install(FILES consumer_jack.yml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/jackrack)
+install(FILES consumer_jack.yml DESTINATION ${MLT_INSTALL_DATA_DIR}/jackrack)
diff --git a/src/modules/kdenlive/CMakeLists.txt b/src/modules/kdenlive/CMakeLists.txt
@@ -12,12 +12,12 @@ target_link_libraries(mltkdenlive PRIVATE mlt m)
 
 set_target_properties(mltkdenlive PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltkdenlive LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltkdenlive LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   filter_boxblur.yml
   filter_freeze.yml
   filter_wave.yml
   producer_framebuffer.yml
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/kdenlive
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/kdenlive
 )
diff --git a/src/modules/motion_est/CMakeLists.txt b/src/modules/motion_est/CMakeLists.txt
@@ -18,12 +18,12 @@ endif()
 
 set_target_properties(mltmotion_est PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltmotion_est LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltmotion_est LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   filter_autotrack_rectangle.yml
   filter_motion_est.yml
   filter_vismv.yml
   producer_slowmotion.yml
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/motion_est
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/motion_est
 )
diff --git a/src/modules/ndi/CMakeLists.txt b/src/modules/ndi/CMakeLists.txt
@@ -14,5 +14,5 @@ endif()
 
 set_target_properties(mltndi PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltndi LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
-install(FILES consumer_ndi.yml producer_ndi.yml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/ndi)
+install(TARGETS mltndi LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
+install(FILES consumer_ndi.yml producer_ndi.yml DESTINATION ${MLT_INSTALL_DATA_DIR}/ndi)
diff --git a/src/modules/normalize/CMakeLists.txt b/src/modules/normalize/CMakeLists.txt
@@ -10,10 +10,10 @@ target_link_libraries(mltnormalize PRIVATE mlt m)
 
 set_target_properties(mltnormalize PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltnormalize LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltnormalize LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   filter_audiolevel.yml
   filter_volume.yml
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/normalize
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/normalize
 )
diff --git a/src/modules/oldfilm/CMakeLists.txt b/src/modules/oldfilm/CMakeLists.txt
@@ -14,7 +14,7 @@ target_link_libraries(mltoldfilm PRIVATE mlt m)
 
 set_target_properties(mltoldfilm PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltoldfilm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltoldfilm LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   filter_dust.yml
@@ -34,5 +34,5 @@ install(FILES
   oldfilm.svg
   tcolor.svg
   vignette.svg
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/oldfilm
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/oldfilm
 )
diff --git a/src/modules/opencv/CMakeLists.txt b/src/modules/opencv/CMakeLists.txt
@@ -6,5 +6,5 @@ target_link_libraries(mltopencv PRIVATE mlt ${OpenCV_LIBS})
 
 set_target_properties(mltopencv PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltopencv LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
-install(FILES filter_opencv_tracker.yml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/opencv)
+install(TARGETS mltopencv LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
+install(FILES filter_opencv_tracker.yml DESTINATION ${MLT_INSTALL_DATA_DIR}/opencv)
diff --git a/src/modules/opengl/CMakeLists.txt b/src/modules/opengl/CMakeLists.txt
@@ -37,7 +37,7 @@ target_compile_definitions(mltopengl PRIVATE SHADERDIR="${SHADERDIR}")
 
 set_target_properties(mltopengl PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltopengl LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltopengl LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   filter_movit_blur.yml
@@ -55,5 +55,5 @@ install(FILES
   transition_movit_luma.yml
   transition_movit_mix.yml
   transition_movit_overlay.yml
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/opengl
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/opengl
 )
diff --git a/src/modules/plus/CMakeLists.txt b/src/modules/plus/CMakeLists.txt
@@ -30,7 +30,7 @@ if(TARGET PkgConfig::FFTW)
   target_sources(mltplus PRIVATE filter_dance.c filter_fft.c)
   target_link_libraries(mltplus PRIVATE PkgConfig::FFTW)
   target_compile_definitions(mltplus PRIVATE USE_FFTW)
-  install(FILES filter_dance.yml filter_fft.yml DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/plus)
+  install(FILES filter_dance.yml filter_fft.yml DESTINATION ${MLT_INSTALL_DATA_DIR}/plus)
 endif()
 
 if(TARGET PkgConfig::libebur128)
@@ -43,7 +43,7 @@ endif()
 
 set_target_properties(mltplus PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltplus LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltplus LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   consumer_blipflash.yml
@@ -66,5 +66,5 @@ install(FILES
   producer_blipflash.yml
   producer_count.yml
   transition_affine.yml
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/plus
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/plus
 )
diff --git a/src/modules/plusgpl/CMakeLists.txt b/src/modules/plusgpl/CMakeLists.txt
@@ -22,12 +22,12 @@ endif()
 
 set_target_properties(mltplusgpl PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${MLT_MODULE_OUTPUT_DIRECTORY}")
 
-install(TARGETS mltplusgpl LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mlt)
+install(TARGETS mltplusgpl LIBRARY DESTINATION ${MLT_INSTALL_MODULE_DIR})
 
 install(FILES
   consumer_cbrts.yml
   filter_burningtv.yml
   filter_lumaliftgaingamma.yml
   filter_rotoscoping.yml
-  DESTINATION ${CMAKE_INSTALL_DATADIR}/mlt/plusgpl
+  DESTINATION ${MLT_INSTALL_DATA_DIR}/plusgpl
 )