Merge pull request #1636 from cmuellner/cmake-build-fedora

Adjust CMake build behavior to match Qt project files

plugins/velleman/src/CMakeLists.txt

@@ -61,7 +61,10 @@ else()
     )
 endif()
 
-install(TARGETS ${module_name}
-    LIBRARY DESTINATION ${INSTALLROOT}/${PLUGINDIR}
-    RUNTIME DESTINATION ${INSTALLROOT}/${PLUGINDIR}
-)
+# Installation only on Windows; Unix targets are built only for unit testing.
+if(WIN32)
+    install(TARGETS ${module_name}
+        LIBRARY DESTINATION ${INSTALLROOT}/${PLUGINDIR}
+        RUNTIME DESTINATION ${INSTALLROOT}/${PLUGINDIR}
+    )
+endif()

resources/resources.pro

@@ -1,6 +1,5 @@
 TEMPLATE = subdirs
 
-!qmlui: SUBDIRS += docs
 SUBDIRS += fixtures
 SUBDIRS += gobos
 SUBDIRS += inputprofiles

variables.cmake

@@ -89,7 +89,7 @@ if (WIN32)
 elseif (APPLE)
     set(LIBSDIR "Frameworks")
 elseif (UNIX)
-    set(LIBSDIR "lib/${CMAKE_C_LIBRARY_ARCHITECTURE}")
+    set(LIBSDIR "${CMAKE_INSTALL_LIBDIR}")
 endif ()
 
 if (ANDROID)
@@ -287,9 +287,9 @@ elseif (APPLE)
     set(PLUGINDIR "PlugIns")
 elseif (UNIX)
     if (appimage)
-        set(PLUGINDIR "../lib/qt5/plugins/qlcplus")
+        set(PLUGINDIR "../lib/qt${QT_MAJOR_VERSION}/plugins/qlcplus")
     else ()
-        set(PLUGINDIR "${LIBSDIR}/qt5/plugins/qlcplus")
+        set(PLUGINDIR "${LIBSDIR}/qt${QT_MAJOR_VERSION}/plugins/qlcplus")
     endif ()
 endif ()