Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / development / cmake / modules / FindAiksaurusLIB.cmake

diff --git a/development/cmake/modules/FindAiksaurusLIB.cmake b/development/cmake/modules/FindAiksaurusLIB.cmake
index 97370b8b9a7296f368b3ccecca5d8421d4ce269b..d323abe1472ab7f4ef0f206447b9cef78c5c5165 100644 (file)
--- a/development/cmake/modules/FindAiksaurusLIB.cmake
+++ b/development/cmake/modules/FindAiksaurusLIB.cmake
@@ -14,9 +14,9 @@ find_path(AIKSAURUSLIB_INCLUDE_DIR NAMES Aiksaurus.h
   PATH_SUFFIXES "" "Aiksaurus")
 if(AIKSAURUSLIB_INCLUDE_DIR)
   if(AIKSAURUSLIB_INCLUDE_DIR MATCHES "Aiksaurus")
-    set(AIKSAURUS_H Aiksaurus/Aiksaurus.h)
+    set(AIKSAURUSLIB_H Aiksaurus/Aiksaurus.h)
   else()
-    set(AIKSAURUS_H Aiksaurus.h)
+    set(AIKSAURUSLIB_H Aiksaurus.h)
   endif()
 endif()
 
@@ -24,11 +24,13 @@ set(POTENTIAL_AIKSAURUS_LIBS Aiksaurus)
 
 find_library(AIKSAURUSLIB_LIBRARY NAMES ${POTENTIAL_AIKSAURUS_LIBS}
        PATHS
-       /usr/lib /usr/local/lib)
+       ${SYSTEM_LIB_DIRS})
 
 # handle the QUIETLY and REQUIRED arguments and set AIKSAURUSLIB_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(AIKSAURUSLIB DEFAULT_MSG AIKSAURUSLIB_LIBRARY AIKSAURUSLIB_INCLUDE_DIR)
 
-mark_as_advanced(AIKSAURUSLIB_LIBRARY AIKSAURUSLIB_INCLUDE_DIR)
+set(AIKSAURUSLIB_H ${AIKSAURUSLIB_H} CACHE STRING "Aiksaurus header" FORCE)
+
+mark_as_advanced(AIKSAURUSLIB_LIBRARY AIKSAURUSLIB_INCLUDE_DIR AIKSAURUSLIB_H)