diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
| commit | eb2e62609992ab8b47f8805f2bc2cafce271b66f (patch) | |
| tree | 58d6c387f910e3a3348a6528127f4216b524ec57 /CMakeLists.txt | |
| parent | 05dc1666dc794ed6aa7f6568b768c652f8922c4e (diff) | |
| parent | 8d06606835e3d01f537ebe96de8b216e64a1f969 (diff) | |
| download | mana-lpc2012.tar.gz mana-lpc2012.tar.bz2 mana-lpc2012.tar.xz mana-lpc2012.zip | |
Merge branch 'master' into lpc2012lpc2012
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 20695d1b..6b0da2e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -CMAKE_POLICY(VERSION 2.6) +CMAKE_MINIMUM_REQUIRED(VERSION 3.1) +CMAKE_POLICY(VERSION 3.1) PROJECT(MANA) @@ -7,6 +7,8 @@ IF (NOT VERSION) SET(VERSION 0.6.1) ENDIF() +set (CMAKE_CXX_STANDARD 11) + STRING(REPLACE "." " " _VERSION ${VERSION}) SEPARATE_ARGUMENTS(_VERSION) LIST(LENGTH _VERSION _LEN) @@ -31,7 +33,6 @@ FIND_PACKAGE(Gettext) OPTION(WITH_OPENGL "Enable OpenGL support" ON) OPTION(ENABLE_NLS "Enable building of tranlations" ON) OPTION(ENABLE_MANASERV "Enable Manaserv support" ON) -OPTION(ENABLE_CPP0X "Enable use of C++0x features" OFF) IF (WIN32) SET(PKG_DATADIR ".") @@ -39,9 +40,6 @@ IF (WIN32) 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/mana CACHE PATH "Mana datadir") SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Mana bindir") @@ -76,6 +74,6 @@ IF(WIN32) SET(CPACK_NSIS_DISPLAY_NAME "Mana") SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/mana.ico") SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp") - SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.manasource.org") + SET(CPACK_NSIS_URL_INFO_ABOUT "https://www.manasource.org") ENDIF() INCLUDE(CPack) |