From eafb9d28563cfc78250d0e0d6f12992e91156727 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Tue, 12 Mar 2024 14:54:55 +0100 Subject: CMake: Added USE_SYSTEM_GUICHAN option So that one can choose to build with the Guichan submodule also on other systems than macOS. --- src/CMakeLists.txt | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 14547870..e57d5e3f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,32 +17,34 @@ IF (CMAKE_COMPILER_IS_GNUCXX) ENDIF() ENDIF() +SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") +SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"") +SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"") + IF (ENABLE_MANASERV) INCLUDE_DIRECTORIES("../libs/enet/include") LINK_DIRECTORIES("../libs/enet") SET(INTERNAL_LIBRARIES enet) + + SET(FLAGS "${FLAGS} -DMANASERV_SUPPORT=1") + MESSAGE(STATUS "Manaserv support enabled") ENDIF() -IF (APPLE) - INCLUDE_DIRECTORIES("../libs/guichan/include") +IF (APPLE OR NOT USE_SYSTEM_GUICHAN) + MESSAGE(STATUS "Using Guichan submodule") + SET(GUICHAN_INCLUDE_DIR "../libs/guichan/include") + SET(GUICHAN_LIBRARIES guichan) LINK_DIRECTORIES("../libs/guichan") - SET(INTERNAL_LIBRARIES ${INTERNAL_LIBRARIES} guichan) +ELSE() + MESSAGE(STATUS "Using system Guichan") + FIND_PACKAGE(Guichan REQUIRED) ENDIF() -SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") -SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"") -SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"") - IF (ENABLE_NLS) SET(FLAGS "${FLAGS} -DENABLE_NLS=1") MESSAGE(STATUS "i18n support enabled") ENDIF() -IF (ENABLE_MANASERV) - SET(FLAGS "${FLAGS} -DMANASERV_SUPPORT=1") - MESSAGE(STATUS "Manaserv support enabled") -ENDIF() - IF (CMAKE_BUILD_TYPE) STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug OR @@ -62,10 +64,6 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL SunOS) SET(EXTRA_LIBRARIES intl) ENDIF() -IF(NOT APPLE) - FIND_PACKAGE(Guichan REQUIRED) -ENDIF() - IF (WITH_OPENGL) FIND_PACKAGE(OpenGL REQUIRED) INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) -- cgit v1.2.3-70-g09d2