The branch, master has been updated
via 1343f5841f27b505b762d5259e6e7a08643ecd46 (commit)
via 69bb2d7abc48ecbda356d23c5400eba314d6e8ab (commit)
from 442f016443fa8e8617b53e912f28c6d8f1a7482d (commit)
- Log -----------------------------------------------------------------
commit 1343f5841f27b505b762d5259e6e7a08643ecd46
Author: Evgeny Sinelnikov <sin@xxxxxxxxxxx>
Date: Tue May 11 11:05:02 2010 +0400
Fix cmake build with not remove doc directory for build in source
commit 69bb2d7abc48ecbda356d23c5400eba314d6e8ab
Author: Evgeny Sinelnikov <sin@xxxxxxxxxxx>
Date: Sun Jun 28 01:52:02 2009 +0400
Fix libftdi.hpp with include of system ftdi.h
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 4 ++--
ftdipp/ftdi.hpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99e0ceb..a661d0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,8 +124,8 @@ if(DOCUMENTATION AND DOXYGEN_FOUND)
# Create doc directory
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/doc
- COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc
- COMMAND mkdir ${CMAKE_BINARY_DIR}/doc
+ COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc/{html,man}
+ COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc
DEPENDS ftdi ftdipp
)
diff --git a/ftdipp/ftdi.hpp b/ftdipp/ftdi.hpp
index 6cb8f93..ba20346 100644
--- a/ftdipp/ftdi.hpp
+++ b/ftdipp/ftdi.hpp
@@ -32,7 +32,7 @@ on this file might be covered by the GNU General Public
License.
#include <list>
#include <string>
#include <boost/shared_ptr.hpp>
-#include "ftdi.h"
+#include <ftdi.h>
namespace Ftdi
{
hooks/post-receive
--
port libftdi to libusb-1.0
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
