Integrate CMakeLists.txt changes suggested by Alex.

CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required( VERSION 3.16 )
-include(GNUInstallDirs)
 
 # Target platform is Windows 10
 if( CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017" OR
@@ -14,6 +13,7 @@ project( scidavis
   DESCRIPTION "SciDAVis is a free application for Scientific Data Analysis and Visualization."
   HOMEPAGE_URL "https://scidavis.sourceforge.net"
   LANGUAGES CXX C)
+include(GNUInstallDirs)
 
 set( CMAKE_CXX_STANDARD 17)
 set( CMAKE_CXX_STANDARD_REQUIRED TRUE )

libscidavis/CMakeLists.txt

@@ -409,9 +409,9 @@ if( WIN32 )
     )
 else()
   target_compile_definitions( libscidavis PUBLIC
-    TS_PATH="${CMAKE_INSTALL_PREFIX}/share/scidavis/translations"
-    DOC_PATH="${CMAKE_INSTALL_PREFIX}/share/doc/scidavis"
-    PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/lib/scidavis/plugins"
+     TS_PATH="${CMAKE_INSTALL_DATAROOTDIR}/scidavis/translations"
+     DOC_PATH="${CMAKE_INSTALL_DOCDIR}/scidavis"
+     PLUGIN_PATH="${CMAKE_INSTALL_LIBDIR}/scidavis/plugins"
     )
 endif()
 

scidavis/CMakeLists.txt

@@ -17,9 +17,6 @@ foreach(i ${languages})
    list(APPEND TS_FILES "${CMAKE_CURRENT_BINARY_DIR}/translations-copy/scidavis_${i}.ts")
 endforeach()
 
-message("a" "b" "c")
-message(${TS_FILES})
-
 qt5_create_translation( QM_FILES "${CMAKE_SOURCE_DIR}/libscidavis" ${TS_FILES} )
 
 #set( MACOSX_BUNDLE_PLIST scidavis/scidavis.app/Contents/Info.plist )
@@ -36,6 +33,20 @@ add_executable( scidavis
 # SciDAVis expects qm files to be in the translations directory. qt5_create_translation puts them somewhere else
 add_custom_command(TARGET scidavis COMMAND mkdir -p translations || cp ${QM_FILES} translations)
 
+if( WIN32 )
+  target_compile_definitions( scidavis PUBLIC
+    TS_PATH="${CMAKE_INSTALL_PREFIX}/translations"
+    DOC_PATH="${CMAKE_INSTALL_PREFIX}"
+    PLUGIN_PATH="${CMAKE_INSTALL_PREFIX}/fitPlugins"
+    )
+else()
+  target_compile_definitions( scidavis PUBLIC
+     TS_PATH="${CMAKE_INSTALL_DATAROOTDIR}/scidavis/translations"
+     DOC_PATH="${CMAKE_INSTALL_DOCDIR}/scidavis"
+     PLUGIN_PATH="${CMAKE_INSTALL_LIBDIR}/scidavis/plugins"
+    )
+endif()
+
 target_link_libraries( scidavis libscidavis )
 
 if( MULTI_CONFIG )