From 2d30c7d4bb4f137ce209837206bac7bc4661986a Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Tue, 21 Oct 2008 22:46:04 +0200 Subject: [PATCH] cmake rules: Fixed project description, adjusted output name of examples/findall* --- CMakeLists.txt | 4 ++-- examples/CMakeLists.txt | 12 ++++-------- ftdipp/CMakeLists.txt | 3 +-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 028495e..213cb1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers") set(CPACK_COMPONENT_SHAREDLIBS_DESCRIPTION "Shared library for general use.") set(CPACK_COMPONENT_STATICLIBS_DESCRIPTION -"Static library, good if you want to embed libkitclient in your application.") +"Static library, good if you want to embed libftdi in your application.") set(CPACK_COMPONENT_HEADERS_DESCRIPTION "C/C++ header files.") @@ -38,7 +38,7 @@ set(CPACK_COMPONENT_HEADERS_GROUP "Development") # Package information set(CPACK_PACKAGE_VERSION ${VERSION_STRING}) set(CPACK_PACKAGE_CONTACT "Marek Vavrusa ") -set(CPACK_PACKAGE_DESCRIPTION "FITKit multiplatform library.") +set(CPACK_PACKAGE_DESCRIPTION "libftdi library.") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_DESCRIPTION} ) # Package settings diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index dddb0bb..c333678 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -12,7 +12,7 @@ add_executable(bitbang bitbang.c) add_executable(bitbang2 bitbang2.c) add_executable(bitbang_cbus bitbang_cbus.c) add_executable(bitbang_ft2232 bitbang_ft2232.c) -add_executable(findall find_all.c) +add_executable(find_all find_all.c) # Linkage target_link_libraries(simple ftdi) @@ -20,7 +20,7 @@ target_link_libraries(bitbang ftdi) target_link_libraries(bitbang2 ftdi) target_link_libraries(bitbang_cbus ftdi) target_link_libraries(bitbang_ft2232 ftdi) -target_link_libraries(findall ftdi) +target_link_libraries(find_all ftdi) # libftdi++ examples if(FTDI_BUILD_CPP) @@ -28,14 +28,10 @@ if(FTDI_BUILD_CPP) include_directories(${CMAKE_SOURCE_DIR}/ftdipp) # Targest - add_executable(findall-cpp find_all.cpp) + add_executable(find_all_pp find_all_pp.cpp) add_executable(memorytest memorytest.cpp) # Linkage - target_link_libraries(findall-cpp ftdi_cpp) + target_link_libraries(find_all_pp ftdi_cpp) target_link_libraries(memorytest ftdi_cpp) - endif() - - - diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt index d13071a..2759208 100644 --- a/ftdipp/CMakeLists.txt +++ b/ftdipp/CMakeLists.txt @@ -40,7 +40,7 @@ endif(${UNIX}) if(${WIN32}) - install( TARGETS ftdi_cpp + install( TARGETS ftdi_cpp DESTINATION bin COMPONENT sharedlibs ) @@ -55,4 +55,3 @@ endif(${WIN32}) else(Boost_FOUND) message(STATUS "Boost not found, won't build libftdi++") endif(Boost_FOUND) - -- 1.7.1