File fix-cmake.patch of Package supertux2

Overview Repositories Revisions Requests Users Attributes Meta

File fix-cmake.patch of Package supertux2 (Revision 3e4c12895edbbce5b44da57a2ad66b3e)

Currently displaying revision 3e4c12895edbbce5b44da57a2ad66b3e , Show latest

diff -Nur supertux-0.4.0/CMakeLists.txt new/CMakeLists.txt
--- supertux-0.4.0/CMakeLists.txt	2015-12-20 15:56:34.000000000 +0100
+++ new/CMakeLists.txt	2016-08-02 02:29:47.979169477 +0200
@@ -219,37 +219,49 @@
 INCLUDE(ConfigureChecks)
 
 ## Also execute instructions in external/squirrel/CMakeLists.txt
+FIND_PACKAGE(Squirrel)
 
-IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt)
-  message(FATAL_ERROR "squirrel submodule is not checked out or ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt is missing")
-ENDIF()
+IF(NOT Squirrel_FOUND)
+  IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt)
+    message(FATAL_ERROR "squirrel submodule is not checked out or ${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/CMakeLists.txt is missing")
+  ENDIF()
 
-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
+  ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
 
-## Add squirrel lib dir to search path
+  ## Add squirrel lib dir to search path
 
-LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/external/squirrel)
+  LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/external/squirrel)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/)
+  SET(Squirrel_LIBRARY squirrel)
+ELSE()
+  INCLUDE_DIRECTORIES(${Squirrel_INCLUDE_DIR})
+ENDIF()
 
 ## Also execute instructions in external/tinygettext/CMakeLists.txt
+FIND_PACKAGE(Tinygettext)
 
-IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt)
-  message(FATAL_ERROR "tinygettext submodule is not checked out or ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt is missing")
-ENDIF()
+IF(NOT Tinygettext_FOUND)
+  IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt)
+    message(FATAL_ERROR "tinygettext submodule is not checked out or ${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/CMakeLists.txt is missing")
+  ENDIF()
 
-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext)
+  ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext)
 
-## Add tinygettext lib dir to search path
+  ## Add tinygettext lib dir to search path
 
-LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/external/tinygettext)
+  LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/external/tinygettext)
+  include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/include/)
+  SET(Tinygettext_LIBRARY tinygettext)
+ELSE()
+  INCLUDE_DIRECTORIES(${Tinygettext_INCLUDE_DIR})
+ENDIF()
 
 ## Some additional include paths
 
 include_directories (${CMAKE_BINARY_DIR}/)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/)
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/include/)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
 
@@ -470,8 +482,8 @@
 TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC ${SDL2_LIBRARIES})
 TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC ${SDL2IMAGE_LIBRARIES})
 
-TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC squirrel)
-TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC tinygettext)
+TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC ${Squirrel_LIBRARY} ${Squirrel_STD_LIBRARY})
+TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC ${Tinygettext_LIBRARY})
 TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC ${OPENAL_LIBRARY})
 TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC ${OGGVORBIS_LIBRARIES})
 TARGET_LINK_LIBRARIES(supertux2_lib PUBLIC ${PHYSFS_LIBRARY})
@@ -577,7 +589,7 @@
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
 ENDIF(WIN32 AND NOT UNIX)
 
-INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})
+INSTALL(TARGETS supertux2_exe RUNTIME DESTINATION ${INSTALL_SUBDIR_BIN})
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
 
diff -Nur supertux-0.4.0/mk/cmake/FindSquirrel.cmake new/mk/cmake/FindSquirrel.cmake
--- supertux-0.4.0/mk/cmake/FindSquirrel.cmake	1970-01-01 01:00:00.000000000 +0100
+++ new/mk/cmake/FindSquirrel.cmake	2016-08-02 02:03:47.780403934 +0200
@@ -0,0 +1,20 @@
+# - Try to find Squirrel
+# Once done this will define
+#
+#  Squirrel_FOUND - system has Squirrel
+#  Squirrel_INCLUDE_DIR - the include directory
+#  Squirrel_LIBRARY - The Squirrel library
+#  Squirrel_STD_LIBRARY - The Squirrel std library
+
+
+FIND_PATH(Squirrel_INCLUDE_DIR squirrel.h PATH_SUFFIXES squirrel)
+FIND_LIBRARY(Squirrel_LIBRARY NAMES squirrel PATH_SUFFIXES squirrel)
+FIND_LIBRARY(Squirrel_STD_LIBRARY NAMES sqstdlib PATH_SUFFIXES squirrel)
+
+MARK_AS_ADVANCED(Squirrel_INCLUDE_DIR Squirrel_LIBRARY)
+
+IF(Squirrel_INCLUDE_DIR AND Squirrel_LIBRARY)
+	SET(Squirrel_FOUND TRUE)
+ELSE(Squirrel_INCLUDE_DIR AND Squirrel_LIBRARY)
+	SET(Squirrel_FOUND FALSE)
+ENDIF(Squirrel_INCLUDE_DIR AND Squirrel_LIBRARY)
\ No newline at end of file
diff -Nur supertux-0.4.0/mk/cmake/FindTinygettext.cmake new/mk/cmake/FindTinygettext.cmake
--- supertux-0.4.0/mk/cmake/FindTinygettext.cmake	1970-01-01 01:00:00.000000000 +0100
+++ new/mk/cmake/FindTinygettext.cmake	2016-08-02 02:47:26.486056479 +0200
@@ -0,0 +1,53 @@
+#  This is free and unencumbered software released into the public domain.
+#
+#  Anyone is free to copy, modify, publish, use, compile, sell, or
+#  distribute this software, either in source code form or as a compiled
+#  binary, for any purpose, commercial or non-commercial, and by any
+#  means.
+#
+#  In jurisdictions that recognize copyright laws, the author or authors
+#  of this software dedicate any and all copyright interest in the
+#  software to the public domain. We make this dedication for the benefit
+#  of the public at large and to the detriment of our heirs and
+#  successors. We intend this dedication to be an overt act of
+#  relinquishment in perpetuity of all present and future rights to this
+#  software under copyright law.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+#  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+#  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+#  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#  OTHER DEALINGS IN THE SOFTWARE.
+
+set(Tinygettext_FOUND FALSE)
+
+if (NOT Tinygettext_INCLUDE_DIR)
+  find_path(Tinygettext_INCLUDE_DIR tinygettext/tinygettext.hpp
+    /usr/include
+    /usr/local/include
+  )
+endif()
+
+if (NOT Tinygettext_LIBRARY)
+  find_library(Tinygettext_LIBRARY tinygettext
+    PATHS /lib /usr/lib /usr/local/lib
+  )
+endif()
+
+if (Tinygettext_LIBRARY AND Tinygettext_INCLUDE_DIR)
+  set(Tinygettext_FOUND TRUE)
+endif()
+
+if(Tinygettext_FOUND)
+  if(NOT Tinygettext_FIND_QUIET)
+    message(STATUS "Found tinygettext library: ${Tinygettext_LIBRARY}")
+  endif()
+else()
+  if(Tinygettext_FIND_REQUIRED)
+    message(FATAL_ERROR "Could NOT find tinygettext library")
+  endif()
+endif()
+
+mark_as_advanced(Tinygettext_LIBRARY Tinygettext_INCLUDE_DIR Tinygettext_FOUND)

Places

File fix-cmake.patch of Package supertux2 (Revision 3e4c12895edbbce5b44da57a2ad66b3e)

Places