Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/cmaketemplate
This commit is contained in:
commit
f998384b6e
@ -14,7 +14,7 @@ set(CMAKE_AUTOUIC ON)
|
|||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
|
|
||||||
configure_file (
|
configure_file (
|
||||||
"SparrowConfig.h.in"
|
"../cmaketemplate/SparrowConfig.h.in"
|
||||||
"${PROJECT_BINARY_DIR}/Version.h"
|
"${PROJECT_BINARY_DIR}/Version.h"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -110,8 +110,30 @@ if(USE_SFML)
|
|||||||
${LIB_PATHS}
|
${LIB_PATHS}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
set(USE_OPENGL True)
|
||||||
|
|
||||||
add_definitions(-DSFML_STATIC)
|
add_definitions(-DSFML_STATIC)
|
||||||
LIST(APPEND LIB_DEPENDENCIES_LIST ${SFML_LIBRARY_AUDIO} ${SFML_LIBRARY_GRAPHICS} ${SFML_LIBRARY_WINDOW} ${SFML_LIBRARY_SYSTEM})
|
|
||||||
|
if(WIN32)
|
||||||
|
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)
|
||||||
|
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()
|
endif()
|
||||||
|
|
||||||
if(USE_RENDERER)
|
if(USE_RENDERER)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user