49 lines
1.8 KiB
Plaintext
49 lines
1.8 KiB
Plaintext
remove check for submodules
|
|
fix man path
|
|
|
|
Index: CMakeLists.txt
|
|
--- CMakeLists.txt.orig
|
|
+++ CMakeLists.txt
|
|
@@ -102,18 +102,6 @@ endif()
|
|
# Sanity check : Check that all submodules are present
|
|
# =======================================================================
|
|
|
|
-function(check_submodules_present)
|
|
- file(READ "${PROJECT_SOURCE_DIR}/.gitmodules" gitmodules)
|
|
- string(REGEX MATCHALL "path *= *[^ \t\r\n]*" gitmodules ${gitmodules})
|
|
- foreach(module ${gitmodules})
|
|
- string(REGEX REPLACE "path *= *" "" module ${module})
|
|
- if (NOT EXISTS "${PROJECT_SOURCE_DIR}/${module}/.git")
|
|
- message(SEND_ERROR "Git submodule ${module} not found."
|
|
- "Please run: git submodule update --init --recursive")
|
|
- endif()
|
|
- endforeach()
|
|
-endfunction()
|
|
-check_submodules_present()
|
|
|
|
configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc
|
|
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
|
|
@@ -189,6 +177,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DI
|
|
# Prefer the -pthread flag on Linux.
|
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
|
find_package(Threads REQUIRED)
|
|
+find_package(fmt REQUIRED)
|
|
+find_package(Catch2 REQUIRED)
|
|
|
|
if (ENABLE_QT)
|
|
if (CITRA_USE_BUNDLED_QT)
|
|
@@ -426,11 +416,11 @@ endif()
|
|
if(UNIX)
|
|
if(ENABLE_SDL2)
|
|
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra.6"
|
|
- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6")
|
|
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man6")
|
|
endif()
|
|
|
|
if (ENABLE_QT)
|
|
install(FILES "${PROJECT_SOURCE_DIR}/dist/citra-qt.6"
|
|
- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man6")
|
|
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man6")
|
|
endif()
|
|
endif()
|