From 47cafde5214832fb4ffacd582344631ac5053e71 Mon Sep 17 00:00:00 2001 From: Zach H Date: Thu, 23 Feb 2017 02:53:18 -0500 Subject: [PATCH] fix lowercase (#2419) * fix lowercase * fix changes * fix .desktop * servatrice .desktop --- CMakeLists.txt | 6 +++--- cockatrice/CMakeLists.txt | 14 +++++++------- cockatrice/sounds/CMakeLists.txt | 2 +- cockatrice/themes/CMakeLists.txt | 2 +- oracle/CMakeLists.txt | 12 ++++++------ servatrice/CMakeLists.txt | 14 +++++++------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index caf8657f..35c925c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,21 +212,21 @@ option(WITH_SERVER "build servatrice" OFF) add_subdirectory(common) if(WITH_SERVER) add_subdirectory(servatrice) - SET(CPACK_INSTALL_CMAKE_PROJECTS "servatrice;servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) + SET(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) endif() # Compile cockatrice (default on) option(WITH_CLIENT "build cockatrice" ON) if(WITH_CLIENT) add_subdirectory(cockatrice) - SET(CPACK_INSTALL_CMAKE_PROJECTS "cockatrice;cockatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) + SET(CPACK_INSTALL_CMAKE_PROJECTS "Cockatrice;Cockatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) endif() # Compile oracle (default on) option(WITH_ORACLE "build oracle" ON) if(WITH_ORACLE) add_subdirectory(oracle) - SET(CPACK_INSTALL_CMAKE_PROJECTS "release/oracle.app;oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) + SET(CPACK_INSTALL_CMAKE_PROJECTS "Oracle;Oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS}) endif() # Compile tests (default off) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 818ab0a5..2ecb5293 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -2,7 +2,7 @@ # # provides the cockatrice binary -PROJECT(cockatrice) +PROJECT(Cockatrice) SET(cockatrice_SOURCES src/abstractcounter.cpp @@ -232,13 +232,13 @@ if(UNIX) set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}") set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.cockatrice.${PROJECT_NAME}") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME}-${PROJECT_VERSION}") - set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME}) + set(MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}") set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION}) set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}) set_target_properties(cockatrice PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/Info.plist) INSTALL(TARGETS cockatrice BUNDLE DESTINATION ./) - INSTALL(FILES ${cockatrice_QM} DESTINATION ./cockatrice.app/Contents/Resources/translations) + INSTALL(FILES ${cockatrice_QM} DESTINATION ./Cockatrice.app/Contents/Resources/translations) else() # Assume linux INSTALL(TARGETS cockatrice RUNTIME DESTINATION bin/) @@ -254,8 +254,8 @@ endif() if(APPLE) # these needs to be relative to CMAKE_INSTALL_PREFIX - set(plugin_dest_dir cockatrice.app/Contents/Plugins) - set(qtconf_dest_dir cockatrice.app/Contents/Resources) + set(plugin_dest_dir Cockatrice.app/Contents/Plugins) + set(qtconf_dest_dir Cockatrice.app/Contents/Resources) get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) # qt5 plugins: audio, iconengines, imageformats, platforms, printsupport @@ -275,7 +275,7 @@ Data = Resources\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") set(BU_CHMOD_BUNDLE_ITEMS ON) include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/cockatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Cockatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") " COMPONENT Runtime) endif() @@ -300,7 +300,7 @@ Data = Resources\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") set(BU_CHMOD_BUNDLE_ITEMS ON) include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/cockatrice.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Cockatrice.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") " COMPONENT Runtime) if(WIN32SSLRUNTIME_FOUND) diff --git a/cockatrice/sounds/CMakeLists.txt b/cockatrice/sounds/CMakeLists.txt index 80babdc3..c7829148 100644 --- a/cockatrice/sounds/CMakeLists.txt +++ b/cockatrice/sounds/CMakeLists.txt @@ -9,7 +9,7 @@ SET(defsounds if(UNIX) if(APPLE) - INSTALL(DIRECTORY ${defsounds} DESTINATION cockatrice.app/Contents/Resources/sounds/) + INSTALL(DIRECTORY ${defsounds} DESTINATION Cockatrice.app/Contents/Resources/sounds/) else() # Assume linux INSTALL(DIRECTORY ${defsounds} DESTINATION share/cockatrice/sounds/) diff --git a/cockatrice/themes/CMakeLists.txt b/cockatrice/themes/CMakeLists.txt index dc3b9b50..2ec2ae87 100644 --- a/cockatrice/themes/CMakeLists.txt +++ b/cockatrice/themes/CMakeLists.txt @@ -12,7 +12,7 @@ SET(defthemes if(UNIX) if(APPLE) - INSTALL(DIRECTORY ${defthemes} DESTINATION cockatrice.app/Contents/Resources/themes/) + INSTALL(DIRECTORY ${defthemes} DESTINATION Cockatrice.app/Contents/Resources/themes/) else() # Assume linux INSTALL(DIRECTORY ${defthemes} DESTINATION share/cockatrice/themes/) diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 70fc2ec5..831bbce1 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -2,7 +2,7 @@ # # provides the oracle binary -PROJECT(oracle) +PROJECT(Oracle) # paths set(DESKTOPDIR share/applications CACHE STRING "path to .desktop files") @@ -129,7 +129,7 @@ if(UNIX) set_target_properties(oracle PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/Info.plist) INSTALL(TARGETS oracle BUNDLE DESTINATION ./) - INSTALL(FILES ${oracle_QM} DESTINATION ./oracle.app/Contents/Resources/translations) + INSTALL(FILES ${oracle_QM} DESTINATION ./Oracle.app/Contents/Resources/translations) else() # Assume linux INSTALL(TARGETS oracle RUNTIME DESTINATION bin/) @@ -148,8 +148,8 @@ ENDIF (NOT WIN32 AND NOT APPLE) if(APPLE) # 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) + set(plugin_dest_dir Oracle.app/Contents/Plugins) + set(qtconf_dest_dir Oracle.app/Contents/Resources) get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) # qt5 plugins: iconengines, platforms @@ -168,7 +168,7 @@ Translations = Resources/translations\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") set(BU_CHMOD_BUNDLE_ITEMS ON) include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\") " COMPONENT Runtime) endif() @@ -202,7 +202,7 @@ Translations = Resources/translations\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") set(BU_CHMOD_BUNDLE_ITEMS ON) include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\") " COMPONENT Runtime) endif() #Compile a portable version, default off diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index d1d85b34..805966fc 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -2,7 +2,7 @@ # # provides the servatrice binary -PROJECT(servatrice) +PROJECT(Servatrice) SET(servatrice_SOURCES src/main.cpp @@ -127,8 +127,8 @@ if(UNIX) set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}) INSTALL(TARGETS servatrice BUNDLE DESTINATION ./) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.ini.example DESTINATION ./servatrice.app/Contents/Resources/) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.sql DESTINATION ./servatrice.app/Contents/Resources/) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.ini.example DESTINATION ./Servatrice.app/Contents/Resources/) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/servatrice.sql DESTINATION ./Servatrice.app/Contents/Resources/) else() # Assume linux INSTALL(TARGETS servatrice RUNTIME DESTINATION bin/) @@ -147,8 +147,8 @@ endif() if(APPLE) # these needs to be relative to CMAKE_INSTALL_PREFIX - set(plugin_dest_dir servatrice.app/Contents/Plugins) - set(qtconf_dest_dir servatrice.app/Contents/Resources) + set(plugin_dest_dir Servatrice.app/Contents/Plugins) + set(qtconf_dest_dir Servatrice.app/Contents/Resources) get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) # qt5 plugins: platforms, sqldrivers/mysql @@ -167,7 +167,7 @@ Translations = Resources/translations\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\") set(BU_CHMOD_BUNDLE_ITEMS ON) include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/servatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\") + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Servatrice.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\") " COMPONENT Runtime) endif() @@ -192,7 +192,7 @@ Translations = Resources/translations\") \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\") set(BU_CHMOD_BUNDLE_ITEMS ON) include(BundleUtilities) - fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/servatrice.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\") + fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/Servatrice.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\") " COMPONENT Runtime) endif() #Compile a portable version, default off