diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-11-13 00:16:49 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-11-13 00:16:49 +0000 |
| commit | 4a2b41ff7cd32887f7af33b9078eb7dad567fa8c (patch) | |
| tree | b0b4b3407b007407e1c7a3b5b001e2575f190b47 /modules | |
| parent | f351181f55c94cba3988ef6be223963ec297b88a (diff) | |
| download | extra-cmake-modules-4a2b41ff7cd32887f7af33b9078eb7dad567fa8c.tar.gz extra-cmake-modules-4a2b41ff7cd32887f7af33b9078eb7dad567fa8c.tar.bz2 | |
-fix FindStrigi when pkg-config didn't find strigi:
in this case STRIGI_INCLUDEDIR is empty, and then used as result
variable for FIND_PATH(). But FIND_PATH() only does something if
the used variable contains "NOTFOUND", so it didn't search for the header actually.
Now FIND_PATH() uses STRIGI_INCLUDE_DIR and sets STRIGI_INCLUDEDIR for compatibility.
Hint: FOO_INCLUDE_DIR is the correct naming according to the cmake module coding rules
(see kdelibs/cmake/modules/cmake-modules/styleguide.txt), not legacy.
Alex
CCMAIL: helio@kde.org
Helio: are you sure there are not other such breakages left ? I'm always *very* cautious when touching these files,
I still have a bad feeling after these big changes.
svn path=/trunk/KDE/kdelibs/; revision=883470
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindStrigi.cmake | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 05d1f7b4..843dc358 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -32,16 +32,17 @@ if (NOT WIN32) endif(NOT WIN32) if (NOT STRIGI_INCLUDEDIR) - find_path(STRIGI_INCLUDEDIR strigi/streamanalyzer.h - PATHS - ${strigi_home}/include - ${STRIGI_INCLUDEDIR} - ${_program_FILES_DIR}/strigi/include + find_path(STRIGI_INCLUDE_DIR strigi/streamanalyzer.h + PATHS + ${strigi_home}/include + ${STRIGI_INCLUDEDIR} + ${_program_FILES_DIR}/strigi/include ) + set( STRIGI_INCLUDEDIR ${STRIGI_INCLUDE_DIR} ) +else (NOT STRIGI_INCLUDEDIR) + set( STRIGI_INCLUDE_DIR ${STRIGI_INCLUDEDIR} ) endif (NOT STRIGI_INCLUDEDIR) -# Legacy -set( STRIGI_INCLUDE_DIR ${STRIGI_INCLUDEDIR} ) find_library_with_debug(STRIGI_STREAMANALYZER_LIBRARY WIN32_DEBUG_POSTFIX d @@ -79,8 +80,8 @@ find_package_handle_standard_args(Strigi if (STRIGI_FOUND) # Check for the SIC change between 0.5.9 and 0.6.0... - MACRO(MACRO_CHECK_STRIGI_API_SCREWUP _RETTYPE _RESULT) - SET (_STRIGI_API_SCREWUP_SOURCE_CODE " + macro(MACRO_CHECK_STRIGI_API_SCREWUP _RETTYPE _RESULT) + set (_STRIGI_API_SCREWUP_SOURCE_CODE " #include <strigi/streamendanalyzer.h> using namespace Strigi; class ScrewupEndAnalyzer : public StreamEndAnalyzer { @@ -98,15 +99,15 @@ int main() return 0; } ") - CHECK_CXX_SOURCE_COMPILES("${_STRIGI_API_SCREWUP_SOURCE_CODE}" ${_RESULT}) - ENDMACRO(MACRO_CHECK_STRIGI_API_SCREWUP) + check_cxx_source_compiles("${_STRIGI_API_SCREWUP_SOURCE_CODE}" ${_RESULT}) + endmacro(MACRO_CHECK_STRIGI_API_SCREWUP) - INCLUDE(CheckCXXSourceCompiles) + include(CheckCXXSourceCompiles) macro_push_required_vars() set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${STRIGI_INCLUDEDIR} ) set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${STRIGI_STREAMS_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} ) - MACRO_CHECK_STRIGI_API_SCREWUP( "signed char" STRIGI_NEEDS_SIGNED_CHAR ) - MACRO_CHECK_STRIGI_API_SCREWUP( "char" STRIGI_NEEDS_CHAR ) + macro_check_strigi_api_screwup( "signed char" STRIGI_NEEDS_SIGNED_CHAR ) + macro_check_strigi_api_screwup( "char" STRIGI_NEEDS_CHAR ) set( STRIGI_NEEDS_SIGNED_CHAR ${STRIGI_NEEDS_SIGNED_CHAR} CACHE BOOL "TRUE if strigi is 0.6.0 or later" ) set( STRIGI_NEEDS_CHAR ${STRIGI_NEEDS_CHAR} CACHE BOOL "TRUE if strigi is 0.5.9 or before" ) if (STRIGI_NEEDS_SIGNED_CHAR) |