diff options
Diffstat (limited to 'modules/FindSoprano.cmake')
| -rw-r--r-- | modules/FindSoprano.cmake | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index 29331cf9..65c22561 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -173,22 +173,16 @@ set(SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND TRUE) set(_plugins "${_plugins} virtuosobackend") endif(EXISTS ${SOPRANO_PLUGIN_DIR}/virtuosobackend.desktop) - + # make sure the Soprano cmake macros are found - # We also include it directly for convinience get_filename_component(_SOPRANO_PREFIX ${SOPRANO_INCLUDE_DIR} PATH) find_file(_SOPRANO_MACRO_FILE NAMES SopranoAddOntology.cmake HINTS ${_SOPRANO_PREFIX}/share/soprano/cmake ) if(_SOPRANO_MACRO_FILE) # new Soprano > 2.3.0 location - include(${_SOPRANO_MACRO_FILE}) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_SOPRANO_PREFIX}/share/soprano/cmake) else(_SOPRANO_MACRO_FILE) # the old Soprano 2.3.0 location - find_file(_SOPRANO_MACRO_FILE_OLD NAMES SopranoAddOntology.cmake HINTS ${_SOPRANO_PREFIX}/share/apps/cmake/modules ) - if(_SOPRANO_MACRO_FILE_OLD) - include(${_SOPRANO_MACRO_FILE_OLD}) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_SOPRANO_PREFIX}/share/apps/cmake/modules) - endif(_SOPRANO_MACRO_FILE_OLD) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${_SOPRANO_PREFIX}/share/apps/cmake/modules) endif(_SOPRANO_MACRO_FILE) endif(Soprano_FOUND) @@ -225,8 +219,6 @@ mark_as_advanced(SOPRANO_CLIENT_LIBRARIES SOPRANO_LIBRARIES SOPRANO_SERVER_LIBRARIES SOPRANO_INCLUDE_DIR - SOPRANO_PLUGIN_DIR - _SOPRANO_MACRO_FILE - ) + SOPRANO_PLUGIN_DIR) #endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND SOPRANO_SERVER_LIBRARIES) |