X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=74f80f407e4b66cd4643f7ada5832c90cc4a9aed;hp=f08a58c5d126c2d6aa33a6e24fff709d1aef732d;hb=f838a4e3b0466abc34823750e9eef24d785c8232;hpb=84a46e0a15e704cf3b7140ecd5d9821c37ad3eca diff --git a/CMakeLists.txt b/CMakeLists.txt index f08a58c..74f80f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,11 @@ # Project project(libftdi1) set(MAJOR_VERSION 1) -set(MINOR_VERSION 1) +set(MINOR_VERSION 2) set(PACKAGE libftdi1) set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}) set(VERSION ${VERSION_STRING}) -set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # CMake if("${CMAKE_BUILD_TYPE}" STREQUAL "") @@ -208,8 +208,8 @@ if(CMAKE_VERSION VERSION_LESS 2.8.8) configure_file ( cmake/LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY ) configure_file ( cmake/LibFTDI1ConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake @ONLY ) else () - include(CMakePackageConfigHelpers) - + include(CMakePackageConfigHelpers) + configure_package_config_file ( cmake/LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @@ -226,19 +226,19 @@ else () LibFTDI1ConfigVersion.cmake VERSION ${LIBFTDI_VERSION_STRING} COMPATIBILITY AnyNewerVersion - ) -endif () + ) +endif () install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake cmake/UseLibFTDI1.cmake - + DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR} ) - - + + include(CPack)