$OpenBSD: patch-CMakeLists_txt,v 1.4 2019/02/04 10:02:07 pascal Exp $ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt @@ -55,7 +55,7 @@ include(ConfigureFiles) include(ExternalProject) ## For autopackage -set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/games/supertux2") +set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/supertux2") set(BUILD_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/data") set(BUILD_CONFIG_DATA_DIR "${CMAKE_BINARY_DIR}/data") @@ -249,7 +249,8 @@ if(NOT USE_SYSTEM_PHYSFS) -DLIB_SUFFIX=${LIB_SUFFIX} -DPHYSFS_BUILD_SHARED=${PHYSFS_BUILD_SHARED} -DPHYSFS_BUILD_STATIC=${PHYSFS_BUILD_STATIC} - -DPHYSFS_BUILD_TEST=FALSE) + -DPHYSFS_BUILD_TEST=FALSE + BUILD_BYPRODUCTS "physfs/lib/libphysfs.a") if(WIN32) add_library(physfs_lib SHARED IMPORTED) @@ -392,7 +393,9 @@ ExternalProject_Add(squirrel -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX} - -DINSTALL_INC_DIR=include) + -DINSTALL_INC_DIR=include + BUILD_BYPRODUCTS "squirrel/lib/libsqstdlib_static.a" + BUILD_BYPRODUCTS "squirrel/lib/libsquirrel_static.a") if(WIN32) add_library(squirrel_lib SHARED IMPORTED) @@ -435,7 +438,8 @@ ExternalProject_Add(tinygettext -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DSDL2_LIBRARIES=${SDL2_LIBRARIES} -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS} - -DLIB_SUFFIX=${LIB_SUFFIX}) + -DLIB_SUFFIX=${LIB_SUFFIX} + BUILD_BYPRODUCTS "tinygettext/lib/libtinygettext.a") add_library(tinygettext_lib STATIC IMPORTED) set_target_properties(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}") @@ -872,8 +876,8 @@ else(WIN32 AND NOT UNIX) else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING) - set(INSTALL_SUBDIR_BIN "games" CACHE STRING "Installation subdir for binaries") - set(INSTALL_SUBDIR_SHARE "share/games/supertux2" CACHE STRING "Installation subdir for data") + set(INSTALL_SUBDIR_BIN "bin" CACHE STRING "Installation subdir for binaries") + set(INSTALL_SUBDIR_SHARE "share/supertux2" CACHE STRING "Installation subdir for data") set(INSTALL_SUBDIR_DOC "share/doc/supertux2" CACHE STRING "Installation subdir for docs") install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/supertux2.desktop DESTINATION "share/applications")