Blah

git-svn-id: https://svn.onera.fr/Prelude/Prelude/trunk@895 49f62630-d767-4ccd-930e-b3f5589f52e1

examples/sampling_loop/CMakeLists.txt

@@ -43,7 +43,6 @@ Prelude_Compile(NODE ${MODEL_NAME}
                 PLU_FILES ${MODEL_NAME}.plu
                 USER_C_FILES sampling_includes.h
                 TRACING no
-               #EXTERN_BUFFERS
                 )
 
 if (LSMC_RUNNER_EXECUTABLE)

examples/sampling_loop/FindLTTng.cmake

 # - Find LTTng
 # Find the Linux Trace Toolkit - next generation with associated includes path.
 # See http://lttng.org/
-# This module defines
-#  LTTNG_FOUND, If false, LTTng was not found.
+#
+# This module accepts the following optional variables:
+#    LTTNG_PATH_HINT   = A hint on LTTNG install path.
+#
+# This module defines the following variables:
+#    LTTNG_FOUND       = Was LTTng found or not?
+#    LTTNG_EXECUTABLE  = The path to lttng command
+#    LTTNG_LIBRARIES   = The list of libraries to link to when using LTTng
+#    LTTNG_INCLUDE_DIR = The path to LTTng include directory
+#
 # On can set LTTNG_PATH_HINT before using find_package(LTTng) and the
 # module with use the PATH as a hint to find LTTng.
 #
 # The hint can be given on the command line too:
 #   cmake -DLTTNG_PATH_HINT=/DATA/ERIC/LTTng /path/to/source
 
-
 if(LTTNG_PATH_HINT)
   message(STATUS "FindLTTng: using PATH HINT: ${LTTNG_PATH_HINT}")
 else()
@@ -36,14 +43,37 @@ find_library(LTTNG_UST_LIBRARY lttng-ust PATHS ${LTTNG_LIBRARY_DIR})
 find_library(URCU_LIBRARY urcu-bp PATHS ${LTTNG_LIBRARY_DIR})
 find_library(UUID_LIBRARY uuid)
 
+# If find_path didn't work try with UST lib name
+if(NOT LTTNG_LIBRARY_DIR)
+  get_filename_component(LTTNG_PATH_HINT "${LTTNG_UST_LIBRARY}" DIRECTORY)
+  find_path(LTTNG_LIBRARY_DIR
+          NAMES liblttng-ust.so
+          PATHS ${LTTNG_PATH_HINT}
+          PATH_SUFFIXES lib
+          DOC "The LTTng libraries")
+endif()
+
 set(LTTNG_LIBRARIES ${LTTNG_UST_LIBRARY} ${URCU_LIBRARY} ${UUID_LIBRARY})
 
+message(STATUS "Looking for lttng executable...")
+set(LTTNG_NAMES "lttng;lttng-ctl")
+# FIND_PROGRAM twice using NO_DEFAULT_PATH on first shot
+find_program(LTTNG_EXECUTABLE
+  NAMES ${LTTNG_NAMES}
+  PATHS ${LTTNG_PATH_HINT}/bin
+  NO_DEFAULT_PATH
+  DOC "The LTTNG command line tool")
+find_program(LTTNG_EXECUTABLE
+  NAMES ${LTTNG_NAMES}
+  PATHS ${LTTNG_PATH_HINT}/bin
+  DOC "The LTTNG command line tool")
+
 # handle the QUIETLY and REQUIRED arguments and set PRELUDE_FOUND to TRUE if
 # all listed variables are TRUE
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LTTNG
                                   REQUIRED_VARS LTTNG_INCLUDE_DIR LTTNG_LIBRARY_DIR)
 # VERSION FPHSA options not handled by CMake version < 2.8.2)
-#                                  VERSION_VAR PRELUDE_COMPILER_VERSION)
+#                                  VERSION_VAR)
 mark_as_advanced(LTTNG_INCLUDE_DIR)
 mark_as_advanced(LTTNG_LIBRARY_DIR)