wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Not use LIBSPECTRE_FOUND as internal variable

Browse Source 
Confuses newer cmakes
remotes/origin/KDE/4.10
Albert Astals Cid 13 years ago
parent 30606cde02
commit 2b4417c4c8
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      cmake/modules/FindLibSpectre.cmake

12
cmake/modules/FindLibSpectre.cmake
Unescape View File

@ -15,7 +15,7 @@
if(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY) if(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
# in cache already # in cache already
set(LIBSPECTRE_FOUND TRUE) set(LIBSPECTRE_INTERNAL_FOUND TRUE)
else(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY) else(LIBSPECTRE_INCLUDE_DIR AND LIBSPECTRE_LIBRARY)
@ -33,7 +33,7 @@ if(NOT WIN32)
# query pkg-config asking for a libspectre >= LIBSPECTRE_MINIMUM_VERSION # query pkg-config asking for a libspectre >= LIBSPECTRE_MINIMUM_VERSION
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${LIBSPECTRE_MINIMUM_VERSION} libspectre RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${LIBSPECTRE_MINIMUM_VERSION} libspectre RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
if(_return_VALUE STREQUAL "0") if(_return_VALUE STREQUAL "0")
set(LIBSPECTRE_FOUND TRUE) set(LIBSPECTRE_INTERNAL_FOUND TRUE)
endif(_return_VALUE STREQUAL "0") endif(_return_VALUE STREQUAL "0")
endif(_SpectreLinkFlags) endif(_SpectreLinkFlags)
else(NOT WIN32) else(NOT WIN32)
@ -42,10 +42,10 @@ else(NOT WIN32)
find_path(LIBSPECTRE_INCLUDE_DIR spectre.h PATH_SUFFIXES libspectre ) find_path(LIBSPECTRE_INCLUDE_DIR spectre.h PATH_SUFFIXES libspectre )
set(LIBSPECTRE_FOUND TRUE) set(LIBSPECTRE_INTERNAL_FOUND TRUE)
endif(NOT WIN32) endif(NOT WIN32)
if (LIBSPECTRE_FOUND) if (LIBSPECTRE_INTERNAL_FOUND)
set(LIBSPECTRE_LIBRARY ${_SpectreLinkFlags}) set(LIBSPECTRE_LIBRARY ${_SpectreLinkFlags})
# the cflags for libspectre can contain more than one include path # the cflags for libspectre can contain more than one include path
@ -55,10 +55,10 @@ if (LIBSPECTRE_FOUND)
set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} ${_includedir}) set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} ${_includedir})
endforeach(_includedir) endforeach(_includedir)
endif (LIBSPECTRE_FOUND) endif (LIBSPECTRE_INTERNAL_FOUND)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(LibSpectre DEFAULT_MSG LIBSPECTRE_LIBRARY LIBSPECTRE_FOUND) find_package_handle_standard_args(LibSpectre DEFAULT_MSG LIBSPECTRE_LIBRARY LIBSPECTRE_INTERNAL_FOUND)
# ensure that they are cached # ensure that they are cached
set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} CACHE INTERNAL "The libspectre include path") set(LIBSPECTRE_INCLUDE_DIR ${LIBSPECTRE_INCLUDE_DIR} CACHE INTERNAL "The libspectre include path")

Write Preview
Loading…
Cancel
Save