Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move package feature definitions to top-level CMake file

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-03-09 17:24:04 +00:00
parent 8751b27a01
commit f8585337cc
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -510,6 +510,22 @@ if(NOT WITH_NAS OR NOT NAS_FOUND)
katie_definition(-DQT_NO_NAS)
endif()
if(NOT WITH_PNG OR NOT PNG_FOUND)
katie_definition(-DQT_NO_IMAGEFORMAT_PNG)
endif()
if(NOT WITH_JPEG OR NOT JPEG_FOUND)
katie_definition(-DQT_NO_IMAGEFORMAT_JPEG)
endif()
if(NOT WITH_MNG OR NOT MNG_FOUND)
katie_definition(-DQT_NO_IMAGEFORMAT_MNG)
endif()
if(NOT WITH_TIFF OR NOT TIFF_FOUND)
katie_definition(-DQT_NO_IMAGEFORMAT_TIFF)
endif()
# semi-shared
include(src/shared/linguist/linguist.cmake)
include(src/shared/bootstrap.cmake)

1
src/gui/egl/egl.cmake
View file

@ -32,6 +32,5 @@ else()
${CMAKE_CURRENT_SOURCE_DIR}/egl/qegl_stub.cpp
${CMAKE_CURRENT_SOURCE_DIR}/egl/qeglproperties_stub.cpp
)
add_definitions(-DQT_NO_EGL)
endif()

8
src/gui/image/image.cmake
View file

@ -91,8 +91,6 @@ if(WITH_PNG AND PNG_FOUND)
)
include_directories(${PNG_INCLUDE_DIRS})
add_definitions(${PNG_DEFINITIONS})
else()
add_definitions(-DQT_NO_IMAGEFORMAT_PNG)
endif()
if(WITH_JPEG AND JPEG_FOUND)
@ -109,8 +107,6 @@ if(WITH_JPEG AND JPEG_FOUND)
${JPEG_LIBRARIES}
)
include_directories(${JPEG_INCLUDE_DIR})
else()
add_definitions(-DQT_NO_IMAGEFORMAT_JPEG)
endif()
if(WITH_MNG AND MNG_FOUND)
@ -127,8 +123,6 @@ if(WITH_MNG AND MNG_FOUND)
${MNG_LIBRARIES}
)
include_directories(${MNG_INCLUDES})
else()
add_definitions(-DQT_NO_IMAGEFORMAT_MNG)
endif()
if(WITH_TIFF AND TIFF_FOUND)
@ -145,8 +139,6 @@ if(WITH_TIFF AND TIFF_FOUND)
${TIFF_LIBRARIES}
)
include_directories(${TIFF_INCLUDE_DIR})
else()
add_definitions(-DQT_NO_IMAGEFORMAT_TIFF)
endif()
if(KATIE_PLATFORM STREQUAL "win32")