first iteration of the modules update
This commit is contained in:
parent
66a2614941
commit
cd37c95e7c
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user