mirror of
https://invent.kde.org/graphics/okular
synced 2024-10-05 23:49:20 +00:00
change the way we build qgs and the ghostscript plugin of okular: instead of
compiling both separately and relying on the installed qgs for okular, only look for libgs and build both qgs and ghostscript at the same time. svn path=/branches/work/kde4/playground/graphics/cmake/; revision=546363
This commit is contained in:
parent
c4dbfa5ea3
commit
6f25714b53
|
@ -1,4 +1,4 @@
|
|||
# install the cmake files
|
||||
|
||||
install_files(/share/apps/cmake/modules FILES FindQGS.cmake )
|
||||
#install_files(/share/apps/cmake/modules FILES FindQGS.cmake )
|
||||
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
# - Try to find the qgs library
|
||||
# Once done this will define
|
||||
#
|
||||
# QGS_FOUND - system has qgs
|
||||
# QGS_INCLUDE_DIR - the qgs include directory
|
||||
# QGS_LIBRARY - Link this to use qgs
|
||||
#
|
||||
include(CheckLibraryExists)
|
||||
|
||||
# reset vars
|
||||
set(QGS_INCLUDE_DIR)
|
||||
set(QGS_LIBRARY)
|
||||
|
||||
FIND_PATH(QGS_INCLUDE_DIR qgs.h
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
${GNUWIN32_DIR}/include
|
||||
${KDE4_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
# ${KDE4_INCLUDE_DIR}/../lib IS UBER UGLY but i did not found a better way
|
||||
find_library(QGS_LIBRARY NAMES qgs
|
||||
PATHS
|
||||
/usr/lib
|
||||
/usr/local/lib
|
||||
${GNUWIN32_DIR}/lib
|
||||
${KDE4_INCLUDE_DIR}/../lib
|
||||
)
|
||||
|
||||
if(QGS_INCLUDE_DIR AND QGS_LIBRARY)
|
||||
set(QGS_FOUND TRUE)
|
||||
endif(QGS_INCLUDE_DIR AND QGS_LIBRARY)
|
||||
|
||||
if (QGS_FOUND)
|
||||
if (NOT QGS_FIND_QUIETLY)
|
||||
message(STATUS "Found qgs: ${QGS_LIBRARY}")
|
||||
endif (NOT QGS_FIND_QUIETLY)
|
||||
else (QGS_FOUND)
|
||||
if (QGS_FIND_REQUIRED)
|
||||
message(FATAL_ERROR "Could NOT find QGS")
|
||||
endif (QGS_FIND_REQUIRED)
|
||||
endif (QGS_FOUND)
|
||||
|
||||
MARK_AS_ADVANCED(QGS_INCLUDE_DIR QGS_LIBRARY)
|
|
@ -3,9 +3,9 @@
|
|||
if(POPPLER_FOUND)
|
||||
add_subdirectory(poppler)
|
||||
endif(POPPLER_FOUND)
|
||||
if(QGS_FOUND)
|
||||
if(LIBGS_FOUND)
|
||||
add_subdirectory(ghostview)
|
||||
endif(QGS_FOUND)
|
||||
endif(LIBGS_FOUND)
|
||||
add_subdirectory( fax )
|
||||
add_subdirectory( kimgio )
|
||||
if(CHM_FOUND)
|
||||
|
|
|
@ -3,6 +3,7 @@ add_subdirectory( conf )
|
|||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/okular
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../..
|
||||
${CMAKE_SOURCE_DIR}/libqgs
|
||||
)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue