diff options
Diffstat (limited to 'fg-cmake-fixes.patch')
| -rw-r--r-- | fg-cmake-fixes.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/fg-cmake-fixes.patch b/fg-cmake-fixes.patch deleted file mode 100644 index 6ab2841a0f41..000000000000 --- a/fg-cmake-fixes.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/CMakeModules/FindDBus.cmake b/CMakeModules/FindDBus.cmake -index 09753d2..b202b08 100644 ---- a/CMakeModules/FindDBus.cmake -+++ b/CMakeModules/FindDBus.cmake -@@ -16,7 +16,7 @@ if(WIN32) - ) - endif() - else() -- include(FindPkgConfig) -+ find_package(PkgConfig) - - if(PKG_CONFIG_FOUND) - # FIXME : clean this up once we requrie CMake 3.6 -@@ -33,5 +33,5 @@ else() - endif(WIN32) - - include(FindPackageHandleStandardArgs) --FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBUS DEFAULT_MSG -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBus DEFAULT_MSG - DBUS_INCLUDE_DIRS DBUS_LIBRARIES) -\ No newline at end of file -diff --git a/CMakeModules/FindLibEvent.cmake b/CMakeModules/FindLibEvent.cmake -index a58202d..fe376ed 100644 ---- a/CMakeModules/FindLibEvent.cmake -+++ b/CMakeModules/FindLibEvent.cmake -@@ -8,5 +8,5 @@ FIND_PATH(LIBEVENT_INCLUDE_DIR event2/event.h PATH_SUFFIXES include HINTS ${ADDI - FIND_LIBRARY(LIBEVENT_LIB NAMES event_core PATH_SUFFIXES lib HINTS ${ADDITIONAL_LIBRARY_PATHS}) - - include(FindPackageHandleStandardArgs) --FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBEVENT DEFAULT_MSG -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibEvent DEFAULT_MSG - LIBEVENT_INCLUDE_DIR LIBEVENT_LIB) -\ No newline at end of file -diff --git a/CMakeModules/Translations.cmake b/CMakeModules/Translations.cmake -index 2012b69..05e9105 100644 ---- a/CMakeModules/Translations.cmake -+++ b/CMakeModules/Translations.cmake -@@ -35,10 +35,10 @@ function(translation_dir_list result curdir) - set(${result} ${dirlist} PARENT_SCOPE) - endfunction() - --translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR}) --message(STATUS "Detected language files: ${LANGUAGES}") -- - if (${do_translate}) -+ translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR}) -+ message(STATUS "Detected language files: ${LANGUAGES}") -+ - set(translation_res "${PROJECT_BINARY_DIR}/translations.qrc") - - add_custom_target(fgfs_qm_files ALL) |