From 3290f734cb73a391b15eda98ca9c10d87fa5cdb4 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 14 Jul 2022 14:26:34 -0700 Subject: Re-enable CMake builds --- .gitignore | 1 - CMakeLists.txt | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ CMakeLists.txt.legacy | 78 --------------------------------------------------- 3 files changed, 78 insertions(+), 79 deletions(-) create mode 100644 CMakeLists.txt delete mode 100644 CMakeLists.txt.legacy diff --git a/.gitignore b/.gitignore index 225591e88..173168e68 100644 --- a/.gitignore +++ b/.gitignore @@ -50,7 +50,6 @@ CPackConfig.cmake CPackSourceConfig.cmake cmake_install.cmake install_manifest.txt -CMakeLists.txt # files created during build *.o diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 000000000..45a1e156c --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,78 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +CMAKE_POLICY(VERSION 2.6) + +PROJECT(MANAPLUS) + +IF (NOT VERSION) + SET(VERSION 1.0.0) +ENDIF() + +STRING(REPLACE "." " " _VERSION ${VERSION}) +SEPARATE_ARGUMENTS(_VERSION) +LIST(LENGTH _VERSION _LEN) +IF(NOT _LEN EQUAL 4 AND NOT _LEN EQUAL 3) + MESSAGE(FATAL_ERROR "Version needs to be in the form MAJOR.MINOR.RELEASE[.BUILD]") +ENDIF() + +LIST(GET _VERSION 0 VER_MAJOR) +LIST(GET _VERSION 1 VER_MINOR) +LIST(GET _VERSION 2 VER_RELEASE) +IF(_LEN EQUAL 4) + LIST(GET _VERSION 3 VER_BUILD) +ELSE() + SET(VER_BUILD 0) +ENDIF() + +# where to look for cmake modules +SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules) + +FIND_PACKAGE(Gettext) + +OPTION(WITH_OPENGL "Enable OpenGL support" ON) +OPTION(ENABLE_NLS "Enable building of tranlations" ON) +OPTION(ENABLE_TMWA "Enable tmwA support" ON) + +IF (WIN32) + SET(PKG_DATADIR ".") + SET(PKG_BINDIR ".") + SET(LOCALEDIR ".") + CONFIGURE_FILE(src/winver.h.in src/winver.h) +ELSE (WIN32) + IF (NOT OSX AND NOT BEOS) + OPTION(USE_X11 "Use X11 Clipboard functionality" ON) + ENDIF () + SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/manaplus) + SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) + SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) +ENDIF (WIN32) + +ADD_SUBDIRECTORY(data) +ADD_SUBDIRECTORY(src) + +IF (GETTEXT_FOUND AND ENABLE_NLS) + ADD_SUBDIRECTORY(po) +ENDIF() + +If(UNIX) + INSTALL(FILES manaplus.desktop DESTINATION share/applications) + INSTALL(FILES manaplustest.desktop DESTINATION share/applications) + + INSTALL(FILES manaplus.appdata.xml DESTINATION share/appdata) +ENDIF() + +SET(CPACK_PACKAGE_NAME "manaplus") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaPlus") +SET(CPACK_PACKAGE_VENDOR "ManaPlus Development Team") +SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") +SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") +SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaPlus") +SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR}) +SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR}) +SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE}) +IF(WIN32) + SET(CPACK_NSIS_DISPLAY_NAME "ManaPlus") + SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico") + SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp") + SET(CPACK_NSIS_URL_INFO_ABOUT "http://manaplus.org") +ENDIF() +INCLUDE(CPack) diff --git a/CMakeLists.txt.legacy b/CMakeLists.txt.legacy deleted file mode 100644 index 45a1e156c..000000000 --- a/CMakeLists.txt.legacy +++ /dev/null @@ -1,78 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -CMAKE_POLICY(VERSION 2.6) - -PROJECT(MANAPLUS) - -IF (NOT VERSION) - SET(VERSION 1.0.0) -ENDIF() - -STRING(REPLACE "." " " _VERSION ${VERSION}) -SEPARATE_ARGUMENTS(_VERSION) -LIST(LENGTH _VERSION _LEN) -IF(NOT _LEN EQUAL 4 AND NOT _LEN EQUAL 3) - MESSAGE(FATAL_ERROR "Version needs to be in the form MAJOR.MINOR.RELEASE[.BUILD]") -ENDIF() - -LIST(GET _VERSION 0 VER_MAJOR) -LIST(GET _VERSION 1 VER_MINOR) -LIST(GET _VERSION 2 VER_RELEASE) -IF(_LEN EQUAL 4) - LIST(GET _VERSION 3 VER_BUILD) -ELSE() - SET(VER_BUILD 0) -ENDIF() - -# where to look for cmake modules -SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules) - -FIND_PACKAGE(Gettext) - -OPTION(WITH_OPENGL "Enable OpenGL support" ON) -OPTION(ENABLE_NLS "Enable building of tranlations" ON) -OPTION(ENABLE_TMWA "Enable tmwA support" ON) - -IF (WIN32) - SET(PKG_DATADIR ".") - SET(PKG_BINDIR ".") - SET(LOCALEDIR ".") - CONFIGURE_FILE(src/winver.h.in src/winver.h) -ELSE (WIN32) - IF (NOT OSX AND NOT BEOS) - OPTION(USE_X11 "Use X11 Clipboard functionality" ON) - ENDIF () - SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/manaplus) - SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) - SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin) -ENDIF (WIN32) - -ADD_SUBDIRECTORY(data) -ADD_SUBDIRECTORY(src) - -IF (GETTEXT_FOUND AND ENABLE_NLS) - ADD_SUBDIRECTORY(po) -ENDIF() - -If(UNIX) - INSTALL(FILES manaplus.desktop DESTINATION share/applications) - INSTALL(FILES manaplustest.desktop DESTINATION share/applications) - - INSTALL(FILES manaplus.appdata.xml DESTINATION share/appdata) -ENDIF() - -SET(CPACK_PACKAGE_NAME "manaplus") -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaPlus") -SET(CPACK_PACKAGE_VENDOR "ManaPlus Development Team") -SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") -SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaPlus") -SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR}) -SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE}) -IF(WIN32) - SET(CPACK_NSIS_DISPLAY_NAME "ManaPlus") - SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico") - SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp") - SET(CPACK_NSIS_URL_INFO_ABOUT "http://manaplus.org") -ENDIF() -INCLUDE(CPack) -- cgit v1.2.3-70-g09d2