diff --git a/CMake/FindOpusFile.cmake b/CMake/FindOpusFile.cmake index c7fcd2fb1f..c1149c8359 100644 --- a/CMake/FindOpusFile.cmake +++ b/CMake/FindOpusFile.cmake @@ -7,7 +7,7 @@ # OPUSFILE_LIBRARIES - Full list of libraries to link (opusfile, opus, ogg) # Use pkg-config to find opusfile if available -find_package(PkgConf) +find_package(PkgConfig) if(PKG_CONFIG_FOUND) pkg_check_modules(PC_OPUSFILE QUIET opusfile) endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 558a2464d0..63642b0f59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,11 +329,11 @@ set_property(TARGET soh PROPERTY APPIMAGE_ICON_FILE "${CMAKE_BINARY_DIR}/sohIcon if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") install(FILES "${CMAKE_BINARY_DIR}/soh/soh.o2r" DESTINATION . COMPONENT ship) -install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/yml/" DESTINATION ./assets COMPONENT ship) +install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/yml/" DESTINATION assets COMPONENT ship) endif() if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") -install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/yml/" DESTINATION ./assets COMPONENT ship) +install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/yml/" DESTINATION assets COMPONENT ship) endif() if(CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -367,7 +367,7 @@ add_dependencies(soh CreateOSXIcons) set(PROGRAM_PERMISSIONS_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) -install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/yml/" DESTINATION ./assets) +install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/yml/" DESTINATION assets) # Rename the installed soh binary to drop the macos suffix INSTALL(CODE "FILE(RENAME \${CMAKE_INSTALL_PREFIX}/../MacOS/soh-macos \${CMAKE_INSTALL_PREFIX}/../MacOS/soh)") diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt index 97925a7e48..f63bf9c935 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -744,7 +744,7 @@ INSTALL(TARGETS soh DESTINATION . COMPONENT ship) endif() if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -INSTALL(FILES $ DESTINATION ./debug COMPONENT ship) +INSTALL(FILES $ DESTINATION debug COMPONENT ship) INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.o2r DESTINATION . COMPONENT ship) endif()