From 1ae0293e7aa959236d3a955c1af1a79e925a902a Mon Sep 17 00:00:00 2001 From: xantares Date: Wed, 14 Aug 2013 21:06:11 +0200 Subject: [PATCH] Also move LibFTDI1Config to /cmake --- CMakeLists.txt | 2 +- LibFTDI1Config.cmake.in | 51 ----------------------------------------- cmake/LibFTDI1Config.cmake.in | 51 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 LibFTDI1Config.cmake.in create mode 100644 cmake/LibFTDI1Config.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 72302d2..c9e4236 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,7 @@ if ( UNIX ) set ( LIBFTDI_VERSION_MINOR ${MINOR_VERSION} ) set ( LIBFTDI_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake ) - configure_file ( LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY ) + configure_file ( cmake/LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY ) install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake cmake/UseLibFTDI1.cmake DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR} ) diff --git a/LibFTDI1Config.cmake.in b/LibFTDI1Config.cmake.in deleted file mode 100644 index 6146bc0..0000000 --- a/LibFTDI1Config.cmake.in +++ /dev/null @@ -1,51 +0,0 @@ -# -*- cmake -*- -# -# LibFTDI1Config.cmake(.in) -# -# Copyright (C) 2013 Intra2net AG and the libftdi developers -# -# This file is part of LibFTDI. -# -# LibFTDI is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License -# version 2.1 as published by the Free Software Foundation; -# - -# Use the following variables to compile and link against LibFTDI: -# LIBFTDI_FOUND - True if LibFTDI was found on your system -# LIBFTDI_USE_FILE - The file making LibFTDI usable -# LIBFTDI_DEFINITIONS - Definitions needed to build with LibFTDI -# LIBFTDI_INCLUDE_DIRS - Directory where OT.hxx can be found -# LIBFTDI_INCLUDE_DIRS - List of directories of LibFTDI and it's dependencies -# LIBFTDI_LIBRARY - LibFTDI library location -# LIBFTDI_LIBRARIES - List of libraries to link against LibFTDI library -# LIBFTDIPP_LIBRARY - LibFTDI C++ wrapper library location -# LIBFTDIPP_LIBRARIES - List of libraries to link against LibFTDI C++ wrapper -# LIBFTDI_LIBRARY_DIRS - List of directories containing LibFTDI' libraries -# LIBFTDI_ROOT_DIR - The base directory of LibFTDI -# LIBFTDI_VERSION_STRING - A human-readable string containing the version -# LIBFTDI_VERSION_MAJOR - The major version of LibFTDI -# LIBFTDI_VERSION_MINOR - The minor version of LibFTDI -# LIBFTDI_VERSION_PATCH - The patch version of LibFTDI -# LIBFTDI_PYTHON_MODULE_PATH - Path to the python module - -set ( LIBFTDI_FOUND 1 ) -set ( LIBFTDI_USE_FILE "@LIBFTDI_USE_FILE@" ) - -set ( LIBFTDI_DEFINITIONS "@LIBFTDI_DEFINITIONS@" ) -set ( LIBFTDI_INCLUDE_DIR "@LIBFTDI_INCLUDE_DIR@" ) -set ( LIBFTDI_INCLUDE_DIRS "@LIBFTDI_INCLUDE_DIRS@" ) -set ( LIBFTDI_LIBRARY "@LIBFTDI_LIBRARY@" ) -set ( LIBFTDI_LIBRARIES "@LIBFTDI_LIBRARIES@" ) -set ( LIBFTDIPP_LIBRARY "@LIBFTDIPP_LIBRARY@" ) -set ( LIBFTDIPP_LIBRARIES "@LIBFTDIPP_LIBRARIES@" ) -set ( LIBFTDI_LIBRARY_DIRS "@LIBFTDI_LIBRARY_DIRS@" ) -set ( LIBFTDI_ROOT_DIR "@LIBFTDI_ROOT_DIR@" ) - -set ( LIBFTDI_VERSION_STRING "@LIBFTDI_VERSION_STRING@" ) -set ( LIBFTDI_VERSION_MAJOR "@LIBFTDI_VERSION_MAJOR@" ) -set ( LIBFTDI_VERSION_MINOR "@LIBFTDI_VERSION_MINOR@" ) -set ( LIBFTDI_VERSION_PATCH "@LIBFTDI_VERSION_PATCH@" ) - -set ( LIBFTDI_PYTHON_MODULE_PATH "@LIBFTDI_PYTHON_MODULE_PATH@" ) - diff --git a/cmake/LibFTDI1Config.cmake.in b/cmake/LibFTDI1Config.cmake.in new file mode 100644 index 0000000..6146bc0 --- /dev/null +++ b/cmake/LibFTDI1Config.cmake.in @@ -0,0 +1,51 @@ +# -*- cmake -*- +# +# LibFTDI1Config.cmake(.in) +# +# Copyright (C) 2013 Intra2net AG and the libftdi developers +# +# This file is part of LibFTDI. +# +# LibFTDI is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License +# version 2.1 as published by the Free Software Foundation; +# + +# Use the following variables to compile and link against LibFTDI: +# LIBFTDI_FOUND - True if LibFTDI was found on your system +# LIBFTDI_USE_FILE - The file making LibFTDI usable +# LIBFTDI_DEFINITIONS - Definitions needed to build with LibFTDI +# LIBFTDI_INCLUDE_DIRS - Directory where OT.hxx can be found +# LIBFTDI_INCLUDE_DIRS - List of directories of LibFTDI and it's dependencies +# LIBFTDI_LIBRARY - LibFTDI library location +# LIBFTDI_LIBRARIES - List of libraries to link against LibFTDI library +# LIBFTDIPP_LIBRARY - LibFTDI C++ wrapper library location +# LIBFTDIPP_LIBRARIES - List of libraries to link against LibFTDI C++ wrapper +# LIBFTDI_LIBRARY_DIRS - List of directories containing LibFTDI' libraries +# LIBFTDI_ROOT_DIR - The base directory of LibFTDI +# LIBFTDI_VERSION_STRING - A human-readable string containing the version +# LIBFTDI_VERSION_MAJOR - The major version of LibFTDI +# LIBFTDI_VERSION_MINOR - The minor version of LibFTDI +# LIBFTDI_VERSION_PATCH - The patch version of LibFTDI +# LIBFTDI_PYTHON_MODULE_PATH - Path to the python module + +set ( LIBFTDI_FOUND 1 ) +set ( LIBFTDI_USE_FILE "@LIBFTDI_USE_FILE@" ) + +set ( LIBFTDI_DEFINITIONS "@LIBFTDI_DEFINITIONS@" ) +set ( LIBFTDI_INCLUDE_DIR "@LIBFTDI_INCLUDE_DIR@" ) +set ( LIBFTDI_INCLUDE_DIRS "@LIBFTDI_INCLUDE_DIRS@" ) +set ( LIBFTDI_LIBRARY "@LIBFTDI_LIBRARY@" ) +set ( LIBFTDI_LIBRARIES "@LIBFTDI_LIBRARIES@" ) +set ( LIBFTDIPP_LIBRARY "@LIBFTDIPP_LIBRARY@" ) +set ( LIBFTDIPP_LIBRARIES "@LIBFTDIPP_LIBRARIES@" ) +set ( LIBFTDI_LIBRARY_DIRS "@LIBFTDI_LIBRARY_DIRS@" ) +set ( LIBFTDI_ROOT_DIR "@LIBFTDI_ROOT_DIR@" ) + +set ( LIBFTDI_VERSION_STRING "@LIBFTDI_VERSION_STRING@" ) +set ( LIBFTDI_VERSION_MAJOR "@LIBFTDI_VERSION_MAJOR@" ) +set ( LIBFTDI_VERSION_MINOR "@LIBFTDI_VERSION_MINOR@" ) +set ( LIBFTDI_VERSION_PATCH "@LIBFTDI_VERSION_PATCH@" ) + +set ( LIBFTDI_PYTHON_MODULE_PATH "@LIBFTDI_PYTHON_MODULE_PATH@" ) + -- 1.7.1