X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=4c2e4fe5c37c3cf90e4b1aab649f5070b9b69cd6;hp=a9fdf5cd6e8bf8d5c517fdbb39446cc4eb4607b3;hb=23d7ac2beac7a4f903c25fd662c3ea59dca1898b;hpb=195ec69650203868ffac02d7a92248688be3c9b1 diff --git a/CMakeLists.txt b/CMakeLists.txt index a9fdf5c..4c2e4fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,11 @@ # Project project(libftdi1) set(MAJOR_VERSION 1) -set(MINOR_VERSION 2) +set(MINOR_VERSION 3) set(PACKAGE libftdi1) -set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}) +set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}rc1) 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)