From c729b243a67274535c1278c6c55a09a5b07acbe1 Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Thu, 24 Jan 2013 11:41:08 +0100 Subject: [PATCH] Renamed LibFTDIConfig.cmake. Cosmetic changes to CMakeLists. --- CMakeLists.txt | 50 ++++++++++++++++---------------- LibFTDI1Config.cmake.in | 47 +++++++++++++++++++++++++++++++ LibFTDIConfig.cmake.in | 47 ------------------------------- UseLibFTDI.cmake | 18 ------------ UseLibFTDI1.cmake | 18 ++++++++++++ bindings/CMakeLists.txt | 7 ++-- examples/cmake_example/CMakeLists.txt | 4 +- 7 files changed, 96 insertions(+), 95 deletions(-) create mode 100644 LibFTDI1Config.cmake.in delete mode 100644 LibFTDIConfig.cmake.in delete mode 100644 UseLibFTDI.cmake create mode 100644 UseLibFTDI1.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 266f08c..1a09e9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,9 @@ if(${CMAKE_BUILD_TYPE} STREQUAL Debug) add_definitions(-DDEBUG) endif(${CMAKE_BUILD_TYPE} STREQUAL Debug) -FIND_PACKAGE(USB1 REQUIRED) -INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIR}) +# find libusb +find_package ( USB1 REQUIRED ) +include_directories ( ${LIBUSB_INCLUDE_DIR} ) # Find Boost (optional package) find_package(Boost) @@ -69,23 +70,23 @@ set(CPACK_PACKAGE_DESCRIPTION "libftdi1 library.") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_DESCRIPTION} ) # Package settings -if(${UNIX}) +if ( UNIX ) set(CPACK_GENERATOR "DEB;RPM") set(CPACK_CMAKE_GENERATOR "Unix Makefiles") set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${PACK_ARCH}) -endif(${UNIX}) +endif () -if(${WIN32}) - set(CPACK_GENERATOR "NSIS") - set(CPACK_CMAKE_GENERATOR "MinGW Makefiles") - set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") - set(CPACK_PACKAGE_VENDOR "") - set(CPACK_PACKAGE_INSTALL_DIRECTORY "libftdi1") - set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") - set(CPACK_NSIS_DISPLAY_NAME "libftdi1") - set(CPACK_NSIS_MODIFY_PATH "ON") -endif(${WIN32}) +if ( WIN32 ) + set ( CPACK_GENERATOR "NSIS" ) + set ( CPACK_CMAKE_GENERATOR "MinGW Makefiles" ) + set ( CPACK_PACKAGE_NAME "${PROJECT_NAME}" ) + set ( CPACK_PACKAGE_VENDOR "" ) + set ( CPACK_PACKAGE_INSTALL_DIRECTORY "libftdi1" ) + set ( CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") + set ( CPACK_NSIS_DISPLAY_NAME "libftdi1" ) + set ( CPACK_NSIS_MODIFY_PATH ON ) +endif () set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE) @@ -94,9 +95,9 @@ set(CPACK_SOURCE_IGNORE_FILES "\\\\.git;~$;build/") set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) # Subdirectories -if(${UNIX}) - set(CPACK_SET_DESTDIR "ON") -endif(${UNIX}) +if ( UNIX ) + set ( CPACK_SET_DESTDIR ON ) +endif () # "make dist" target set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${VERSION_STRING}) @@ -107,12 +108,11 @@ add_custom_target(dist # Documentation - -option(DOCUMENTATION "Generate API documentation with Doxygen" ON) +option ( DOCUMENTATION "Generate API documentation with Doxygen" ON ) -find_package(Doxygen) -if(DOCUMENTATION AND DOXYGEN_FOUND) +find_package ( Doxygen ) +if ( DOCUMENTATION AND DOXYGEN_FOUND ) # Find doxy config message(STATUS "Doxygen found.") @@ -170,7 +170,7 @@ if ( UNIX ) # config script install path if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR ) - set ( LIBFTDI_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libftdi ) + set ( LIBFTDI_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libftdi1 ) endif () get_target_property( _LIBFTDI_LIBRARY_LOCATION ftdi1 LOCATION ) @@ -185,9 +185,9 @@ if ( UNIX ) set ( LIBFTDI_VERSION_MAJOR ${MAJOR_VERSION} ) set ( LIBFTDI_VERSION_MINOR ${MINOR_VERSION} ) - set ( LIBFTDI_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI.cmake ) - configure_file ( LibFTDIConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDIConfig.cmake @ONLY ) - install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDIConfig.cmake UseLibFTDI.cmake + 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 ) + install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake UseLibFTDI1.cmake DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR} ) endif () diff --git a/LibFTDI1Config.cmake.in b/LibFTDI1Config.cmake.in new file mode 100644 index 0000000..679c1c2 --- /dev/null +++ b/LibFTDI1Config.cmake.in @@ -0,0 +1,47 @@ +# -*- 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_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 ( 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/LibFTDIConfig.cmake.in b/LibFTDIConfig.cmake.in deleted file mode 100644 index 428518b..0000000 --- a/LibFTDIConfig.cmake.in +++ /dev/null @@ -1,47 +0,0 @@ -# -*- cmake -*- -# -# LibFTDIConfig.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_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 ( 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/UseLibFTDI.cmake b/UseLibFTDI.cmake deleted file mode 100644 index e7e43b0..0000000 --- a/UseLibFTDI.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# -*- cmake -*- -# -# UseLibFTDI.cmake -# -# 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; -# - - -add_definitions ( ${LIBFTDI_DEFINITIONS} ) -include_directories ( ${LIBFTDI_INCLUDE_DIRS} ) -link_directories ( ${LIBFTDI_LIBRARY_DIRS} ) - diff --git a/UseLibFTDI1.cmake b/UseLibFTDI1.cmake new file mode 100644 index 0000000..e7e43b0 --- /dev/null +++ b/UseLibFTDI1.cmake @@ -0,0 +1,18 @@ +# -*- cmake -*- +# +# UseLibFTDI.cmake +# +# 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; +# + + +add_definitions ( ${LIBFTDI_DEFINITIONS} ) +include_directories ( ${LIBFTDI_INCLUDE_DIRS} ) +link_directories ( ${LIBFTDI_LIBRARY_DIRS} ) + diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index 7091cca..f6dcd30 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -1,7 +1,8 @@ -include(FindSWIG) -include(FindPythonLibs) -include(FindPythonInterp) + +find_package ( SWIG ) include(UseSWIG) +find_package ( PythonLibs ) +find_package ( PythonInterp ) option(PYTHON_BINDINGS "Build python bindings via swig" ON) diff --git a/examples/cmake_example/CMakeLists.txt b/examples/cmake_example/CMakeLists.txt index 44bad3a..fe203ed 100644 --- a/examples/cmake_example/CMakeLists.txt +++ b/examples/cmake_example/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required ( VERSION 2.8 ) project ( example C ) -find_package ( LibFTDI NO_MODULE REQUIRED ) +find_package ( LibFTDI1 NO_MODULE REQUIRED ) include ( ${LIBFTDI_USE_FILE} ) add_executable ( example main.c ) @@ -10,4 +10,4 @@ target_link_libraries( example ${LIBFTDI_LIBRARIES} ) install ( TARGETS example DESTINATION bin ) - \ No newline at end of file + -- 1.7.1