mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-08 17:13:57 -07:00
remove logic for old ccache versions, 32bit, comments
This commit is contained in:
parent
544906042a
commit
d90e5263e0
10 changed files with 47 additions and 55 deletions
|
|
@ -47,7 +47,7 @@ else()
|
|||
file(GLOB oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
|
||||
endif(UPDATE_TRANSLATIONS)
|
||||
|
||||
if(WIN32)
|
||||
if(WIN32) # Windows (including 64bit)
|
||||
set(oracle_SOURCES ${oracle_SOURCES} oracle.rc)
|
||||
endif(WIN32)
|
||||
|
||||
|
|
@ -151,12 +151,12 @@ if(UNIX)
|
|||
|
||||
install(TARGETS oracle BUNDLE DESTINATION ./)
|
||||
else()
|
||||
# Assume linux
|
||||
# Assume Linux
|
||||
install(TARGETS oracle RUNTIME DESTINATION bin/)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/oracle.png DESTINATION ${ICONDIR}/hicolor/48x48/apps)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/oracle.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
|
||||
endif()
|
||||
elseif(WIN32)
|
||||
elseif(WIN32) # Windows (including 64bit)
|
||||
install(TARGETS oracle RUNTIME DESTINATION ./)
|
||||
endif()
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ endif(NOT WIN32 AND NOT APPLE)
|
|||
# Qt plugin handling
|
||||
# ------------------------
|
||||
if(APPLE)
|
||||
# these needs to be relative to CMAKE_INSTALL_PREFIX
|
||||
# These needs to be relative to CMAKE_INSTALL_PREFIX
|
||||
set(plugin_dest_dir oracle.app/Contents/Plugins)
|
||||
set(qtconf_dest_dir oracle.app/Contents/Resources)
|
||||
|
||||
|
|
@ -207,8 +207,8 @@ Translations = Resources/translations\")
|
|||
)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
# these needs to be relative to CMAKE_INSTALL_PREFIX
|
||||
if(WIN32) # Windows (including 64bit)
|
||||
# These needs to be relative to CMAKE_INSTALL_PREFIX
|
||||
set(plugin_dest_dir Plugins)
|
||||
set(qtconf_dest_dir .)
|
||||
list(APPEND libSearchDirs ${QT_LIBRARY_DIR})
|
||||
|
|
@ -265,7 +265,7 @@ endif()
|
|||
# Qt translations
|
||||
# ------------------------
|
||||
if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
|
||||
#Qt6 Translations happen after the executable is built up
|
||||
# Qt6 Translations happen after the executable is built up
|
||||
if(UPDATE_TRANSLATIONS)
|
||||
qt6_add_translations(
|
||||
oracle
|
||||
|
|
@ -286,7 +286,7 @@ if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
|
|||
else()
|
||||
install(FILES ${oracle_QM} DESTINATION ${ORACLE_UNIX_QM_INSTALL_DIR})
|
||||
endif()
|
||||
elseif(WIN32)
|
||||
elseif(WIN32) # Windows (including 64bit)
|
||||
install(FILES ${oracle_QM} DESTINATION ${ORACLE_WIN32_QM_INSTALL_DIR})
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue