|
Lines 1-35
Link Here
|
| 1 |
--- CMakeLists.txt.orig 2020-03-10 14:00:26 UTC |
|
|
| 2 |
+++ CMakeLists.txt |
| 3 |
@@ -491,7 +491,7 @@ if(WIN32) |
| 4 |
endif() |
| 5 |
endif() |
| 6 |
|
| 7 |
-if(NOT WIN32 AND NOT APPLE) |
| 8 |
+if(NOT WIN32 AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD) |
| 9 |
# Enable POSIX extensions such as `readlink` and `ftruncate`. |
| 10 |
add_definitions(-D_POSIX_C_SOURCE=200809L) |
| 11 |
endif() |
| 12 |
@@ -502,8 +502,8 @@ endif() |
| 13 |
|
| 14 |
if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC") |
| 15 |
# Change __FILE__ to only show the path relative to the project folder |
| 16 |
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'") |
| 17 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined -D'__FILE__=\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"'") |
| 18 |
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-macro-redefined") |
| 19 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-builtin-macro-redefined") |
| 20 |
|
| 21 |
if(DEBUG) |
| 22 |
# Note: For Valgrind suppor. |
| 23 |
@@ -564,6 +564,12 @@ if(APPLE) |
| 24 |
|
| 25 |
include(CPack) |
| 26 |
endif() |
| 27 |
+ |
| 28 |
+install(TARGETS devilutionx DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 29 |
+install(FILES Packaging/fedora/devilutionx.desktop DESTINATION ${CMAKE_INSTALL_SHAREDIR}/applications) |
| 30 |
+install(FILES Packaging/resources/16.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/16x16/apps RENAME devilutionx.png) |
| 31 |
+install(FILES Packaging/resources/Diablo_32.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/32x32/apps RENAME devilutionx.png) |
| 32 |
+install(FILES Packaging/resources/Diablo_48.png DESTINATION ${CMAKE_INSTALL_SHAREDIR}/icons/hicolor/48x48/apps RENAME devilutionx.png) |
| 33 |
|
| 34 |
if(SWITCH) |
| 35 |
set(APP_TITLE "DevilutionX") |