From 9e5cea53ad14c38aa9abf396a6558608d7a892bc Mon Sep 17 00:00:00 2001 From: Anselme Date: Tue, 8 Mar 2016 19:24:16 +0100 Subject: [PATCH 1/2] added sfml dependencies --- template.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/template.cmake b/template.cmake index f9ac78c..81a5546 100644 --- a/template.cmake +++ b/template.cmake @@ -105,8 +105,17 @@ if(USE_SFML) ${LIB_PATHS} ) + set(USE_OPENGL True) + add_definitions(-DSFML_STATIC) - LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_AUDIO} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_SYSTEM}) + + LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_AUDIO} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_SYSTEM} ${SFML_LIBRARY_WINDOW}) + + if(WIN32) + LIST(APPEND LIB_DEPENDENCIES_LIST winmm gdi32 freetype jpeg openal32 flac vorbisenc vorbisfile vorbis ogg) + elseif(UNIX) + LIST(APPEND LIB_DEPENDENCIES_LIST freetype jpeg openal flac vorbisenc vorbisfile vorbis ogg) + endif() endif() if(USE_RENDERER) From 5952b7c8c32c4926266e97ca45ee1be2b1d3b24a Mon Sep 17 00:00:00 2001 From: Anselme Date: Tue, 8 Mar 2016 19:36:06 +0100 Subject: [PATCH 2/2] fixed static linking of sfml --- template.cmake | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/template.cmake b/template.cmake index 3df77be..4bd80ee 100644 --- a/template.cmake +++ b/template.cmake @@ -14,7 +14,7 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) configure_file ( - "SparrowConfig.h.in" + "../cmaketemplate/SparrowConfig.h.in" "${PROJECT_BINARY_DIR}/Config.h" ) @@ -111,17 +111,30 @@ if(USE_SFML) ${LIB_PATHS} ) + + set(USE_OPENGL True) add_definitions(-DSFML_STATIC) - LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_AUDIO} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_SYSTEM} ${SFML_LIBRARY_WINDOW}) - if(WIN32) - LIST(APPEND LIB_DEPENDENCIES_LIST winmm gdi32 freetype jpeg openal32 flac vorbisenc vorbisfile vorbis ogg) + find_library(SFML_DEPENDENCIES + NAMES + winmm gdi32 freetype jpeg openal32 flac vorbisenc vorbisfile vorbis ogg + PATHS + ${LIB_PATHS} + ) + LIST(APPEND LIB_DEPENDENCIES_LIST ) elseif(UNIX) - LIST(APPEND LIB_DEPENDENCIES_LIST freetype jpeg openal flac vorbisenc vorbisfile vorbis ogg) - endif() + find_library(SFML_DEPENDENCIES + NAMES + freetype jpeg openal flac vorbisenc vorbisfile vorbis ogg + PATHS + ${LIB_PATHS} + ) + endif() + + LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_SYSTEM} ${SFML_LIBRARY_AUDIO} ${SFML_DEPENDENCIES}) endif() if(USE_RENDERER)