X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=58f664a819c3d6d3318874518d526ac6e59a781c;hp=6655cafc6a6e2568a68cb189bd5a2a0e518418d2;hb=11a50ae5b80b3e03694a19e84513345d0794e563;hpb=0209a3633dc877a577af07d883eb5059e22f6a91 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6655caf..58f664a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Project project(libftdi1 C) set(MAJOR_VERSION 1) -set(MINOR_VERSION 4) +set(MINOR_VERSION 5) set(PACKAGE libftdi1) set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}) set(VERSION ${VERSION_STRING}) @@ -136,7 +136,7 @@ endif () add_subdirectory(src) if ( FTDIPP ) - project(libftdipp1 C CXX) + project(libftdi1 C CXX) add_subdirectory(ftdipp) endif () if ( PYTHON_BINDINGS ) @@ -150,6 +150,7 @@ if ( EXAMPLES ) endif () add_subdirectory(packages) if ( BUILD_TESTS ) + project(libftdi1 C CXX) add_subdirectory(test) endif () @@ -165,7 +166,6 @@ if(${WIN32}) set(libdir ${CMAKE_INSTALL_PREFIX}/bin) endif(${WIN32}) -configure_file(${CMAKE_SOURCE_DIR}/libftdi1.spec.in ${CMAKE_BINARY_DIR}/libftdi1.spec @ONLY) configure_file(${CMAKE_SOURCE_DIR}/libftdi1.pc.in ${CMAKE_BINARY_DIR}/libftdi1.pc @ONLY) configure_file(${CMAKE_SOURCE_DIR}/libftdipp1.pc.in ${CMAKE_BINARY_DIR}/libftdipp1.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc