Fix building package for debian

MishkaRogachev · Nov 10, 2017 · 05be37f · 05be37f
1 parent c1d8f4b
commit 05be37f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -178,14 +178,12 @@ if(ANDROID)
 )
 endif()
 
-# Install instructions
-install(TARGETS ${PROJECT} DESTINATION "/usr/bin")
-install(FILES "debian/jagcs.desktop" DESTINATION "/usr/share/applications/")
-install(FILES "resources/icons/jagcs.svg" DESTINATION "/usr/share/icons/")
-
 # CPack Debian package
 option(WITH_DEBIAN "Include instructions to make Debian package")
 if (WITH_DEBIAN)
+    # https://cmake.org/Bug/view.php?id=14444
+    install(TARGETS ${PROJECT} DESTINATION "/usr/bin")
+
     add_subdirectory(platforms/debian)
 endif (WITH_DEBIAN)
 

diff --git a/platforms/debian/CMakeLists.txt b/platforms/debian/CMakeLists.txt
@@ -1,6 +1,10 @@
 # CMake version string
 cmake_minimum_required(VERSION 3.0)
 
+# Install debian instructions
+install(FILES "jagcs.desktop" DESTINATION "/usr/share/applications/")
+install(FILES "../../resources/icons/jagcs.svg" DESTINATION "/usr/share/icons/")
+
 # CPack generator type
 set(CPACK_GENERATOR "DEB")