X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=CMakeLists.txt;h=002bfc4421c24d23545ce915bdbca60a6a425055;hb=d0d4f2a10842e956e90af678e8270fec96536164;hp=fedd77a6c6ac4714f8445da7117b996a4b47465a;hpb=afd5f1b33c110104a7f286d6d7854157919a0a52;p=supertux.git diff --git a/CMakeLists.txt b/CMakeLists.txt index fedd77a6c..002bfc442 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,12 @@ PROJECT(SUPERTUX) ### CMake configuration -# allow building with old CMake. Use some bundled modules as a fallback +# allow building with old CMake. Set compatibility options. Use some bundled modules as a fallback CMAKE_MINIMUM_REQUIRED(VERSION 2.4) +IF(COMMAND cmake_policy) + CMAKE_POLICY(SET CMP0003 NEW) +ENDIF(COMMAND cmake_policy) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SUPERTUX_SOURCE_DIR}/mk/cmake) # move some config clutter to the advanced section @@ -128,11 +132,13 @@ ENDIF(CURL_FOUND) #LINK_LIBRARIES(${ICONV_LIBRARY}) ## Find revision of WC -FIND_PACKAGE(Subversion) -IF(Subversion_FOUND) - Subversion_WC_INFO(${SUPERTUX_SOURCE_DIR} SUPERTUX) +MARK_AS_ADVANCED(SVNVERSION_EXECUTABLE) +FIND_PROGRAM(SVNVERSION_EXECUTABLE svnversion) +IF(SVNVERSION_EXECUTABLE) + EXECUTE_PROCESS(COMMAND svnversion -n ${SUPERTUX_SOURCE_DIR} + OUTPUT_VARIABLE SUPERTUX_WC_REVISION) SET(REVISION " r${SUPERTUX_WC_REVISION}") -ENDIF(Subversion_FOUND) +ENDIF(SVNVERSION_EXECUTABLE) ## Check platform-dependent build options @@ -390,6 +396,7 @@ INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/INSTALL ${SUPERTUX_SOURCE_DIR}/README ${SUP INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE}) INSTALL(DIRECTORY data/images DESTINATION ${INSTALL_SUBDIR_SHARE} PATTERN ".svn" EXCLUDE) +INSTALL(DIRECTORY data/fonts DESTINATION ${INSTALL_SUBDIR_SHARE} PATTERN ".svn" EXCLUDE) INSTALL(DIRECTORY data/levels DESTINATION ${INSTALL_SUBDIR_SHARE} PATTERN ".svn" EXCLUDE) INSTALL(DIRECTORY data/music DESTINATION ${INSTALL_SUBDIR_SHARE} PATTERN ".svn" EXCLUDE) INSTALL(DIRECTORY data/scripts DESTINATION ${INSTALL_SUBDIR_SHARE} PATTERN ".svn" EXCLUDE)