Skip to content

Commit 7c9429a

Browse files
landrybjef-n
authored andcommittedNov 11, 2018
[Packaging] install icons / appdata / desktop file on BSDs too
(cherry picked from commit 046a20e)
1 parent a50f76f commit 7c9429a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,6 @@ IF (WITH_CORE)
932932
INCLUDE(CPack)
933933
ENDIF (WITH_CORE)
934934

935-
IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
935+
IF (UNIX AND NOT APPLE)
936936
ADD_SUBDIRECTORY(linux)
937-
ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
937+
ENDIF (UNIX AND NOT APPLE)

‎i18n/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ SET(TS_FILES qgis_ar.ts qgis_bg.ts qgis_bs.ts qgis_ca.ts qgis_cs.ts qgis_da.ts q
2525

2626
ADD_TRANSLATION_FILES (QM_FILES ${TS_FILES})
2727

28-
IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
28+
IF (UNIX AND NOT APPLE)
2929
ADD_CUSTOM_COMMAND(
3030
OUTPUT ${CMAKE_BINARY_DIR}/org.qgis.qgis.desktop ${CMAKE_BINARY_DIR}/org.qgis.qgis.appdata.xml
3131
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
@@ -39,7 +39,7 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
3939

4040
INSTALL(FILES ${CMAKE_BINARY_DIR}/org.qgis.qgis.desktop DESTINATION share/applications)
4141
INSTALL(FILES ${CMAKE_BINARY_DIR}/org.qgis.qgis.appdata.xml DESTINATION share/metainfo)
42-
ENDIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
42+
ENDIF (UNIX AND NOT APPLE)
4343

4444
# creating a custom target is needed to make the files build
4545
# "ALL" means that it will be run by default

0 commit comments

Comments
 (0)
Please sign in to comment.