Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

search and include libjpeg only for msvc

Browse source
This commit is contained in:
Tim Felgentreff 2016-03-06 18:17:00 +01:00
parent ebb0c39df6
commit 54b89e3049
2 changed files with 28 additions and 12 deletions

6
CMakeLists.txt
View file

@ -759,6 +759,10 @@ if(WITH_MNG AND MNG_FOUND)
add_definitions(-DUSE_MNG)
include_directories(${MNG_INCLUDE_DIR})
set(stratagus_LIBS ${stratagus_LIBS} ${MNG_LIBRARY})
if (MSVC)
include_directories(${JPEG_INCLUDE_DIR})
set(stratagus_LIBS ${stratagus_LIBS} ${JPEG_LIBRARY})
endif()
endif()
if(WITH_OGGVORBIS AND OGGVORBIS_FOUND)
@ -825,7 +829,7 @@ endif()
if(APPLE)
add_definitions(-DUSE_MAC)
set(SDL_LIBRARY ${SDL_LIBRARY} SDLmain)
set(SDL_LIBRARY ${SDL_LIBRARY} SDLmain)
endif()
if(BSD)

34
cmake/modules/FindMNG.cmake
View file

@ -10,21 +10,33 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if(MNG_INCLUDE_DIR AND MNG_LIBRARY AND JPEG_INCLUDE_DIR AND JPEG_LIBRARY)
if(MNG_INCLUDE_DIR AND MNG_LIBRARY AND ((NOT MSVC) OR (JPEG_INCLUDE_DIR AND JPEG_LIBRARY)))
set(MNG_FOUND true)
else()
find_path(MNG_INCLUDE_DIR libmng.h)
find_path(JPEG_INCLUDE_DIR jpeglib.h)
find_library(MNG_LIBRARY NAMES mng)
find_library(MNG_LIBRARY NAMES jpeg)
if(MNG_INCLUDE_DIR AND MNG_LIBRARY AND JPEG_INCLUDE_DIR AND JPEG_LIBRARY)
set(MNG_FOUND true)
message(STATUS "Found MNG: ${MNG_LIBRARY} and JPEG: ${JPEG_LIBRARY}")
else()
set(MNG_FOUND false)
message(STATUS "Could not find MNG and JPEG")
if(MSVC)
find_path(JPEG_INCLUDE_DIR jpeglib.h)
find_library(JPEG_LIBRARY NAMES jpeg)
endif()
mark_as_advanced(MNG_INCLUDE_DIR MNG_LIBRARY JPEG_INCLUDE_DIR JPEG_LIBRARY)
if(MNG_INCLUDE_DIR AND MNG_LIBRARY AND ((NOT MSVC) OR (JPEG_INCLUDE_DIR AND JPEG_LIBRARY)))
set(MNG_FOUND true)
message(STATUS "Found MNG: ${MNG_LIBRARY}")
if (MSVC)
message(STATUS "Found JPEG: ${JPEG_LIBRARY}")
endif()
else()
set(MNG_FOUND false)
if(MSVC AND (NOT (JPEG_INCLUDE_DIR AND JPEG_LIBRARY)))
message(STATUS "Could not find JPEG")
endif()
message(STATUS "Could not find MNG")
endif()
if(MSVC)
mark_as_advanced(MNG_INCLUDE_DIR MNG_LIBRARY JPEG_INCLUDE_DIR JPEG_LIBRARY)
else()
mark_as_advanced(MNG_INCLUDE_DIR MNG_LIBRARY)
endif()
endif()