From cd37c95e7cfebf4ab5cda6497f223421225f8ce7 Mon Sep 17 00:00:00 2001 From: Anselme Date: Fri, 25 Mar 2016 17:54:57 +0100 Subject: [PATCH] first iteration of the modules update --- template.cmake | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/template.cmake b/template.cmake index cf0d913..c031b62 100644 --- a/template.cmake +++ b/template.cmake @@ -42,13 +42,13 @@ set(LIB_RELEASE_PATH ${DEPENDENCIES_ROOT}/${LIB_RELEASE_FOLDER}) if(${CMAKE_BUILD_TYPE} MATCHES "Debug") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_DEBUG_PATH}) #for STATIC set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_DEBUG_PATH}) #for SHARED - + list(APPEND LIB_PATHS ${LIB_DEBUG_PATH}) list(APPEND LIB_PATHS "\n" ${LIB_RELEASE_PATH}) else() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for STATIC set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for SHARED - + list(APPEND LIB_PATHS ${LIB_RELEASE_PATH}) endif() @@ -110,6 +110,31 @@ if(USE_INPUT) LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_INPUT_LIBRARY}) endif() +if(SFML_MODULES) + if(";${SFML_MODULE};" MATCHES ";graphics;") + set(USE_SFML_GRAPHICS True) + set(USE_SFML_WINDOW True) + set(USE_SFML_SYSTEM True) + endif() + if(";${SFML_MODULE};" MATCHES ";window;") + set(USE_SFML_WINDOW True) + set(USE_SFML_SYSTEM True) + endif() + if(";${SFML_MODULE};" MATCHES ";audio;") + set(USE_SFML_AUDIO True) + set(USE_SFML_SYSTEM True) + endif() + if(";${SFML_MODULE};" MATCHES ";network;") + set(USE_SFML_NETWORK True) + set(USE_SFML_SYSTEM True) + endif() + if(";${SFML_MODULE};" MATCHES ";system;") + set(USE_SFML_SYSTEM True) + endif() + + #TODO update everything to use SFML_MODULES instead of USE_SFML +endif() + if(USE_SFML) find_library(SFML_LIBRARY_WINDOW NAMES @@ -242,8 +267,7 @@ if(USE_BULLET) LIST(APPEND INCLUDE_PATHS "\n" ${INCLUDE_ROOT}/bullet) endif() -# TODO: Complete QT5 -if(USE_QT5) +if(QT_MODULE) MESSAGE(STATUS "using QT5 modules : ${QT_MODULE}") if(";${QT_MODULE};" MATCHES ";core;") find_package(Qt5Core REQUIRED)