Merge the includes-revamp branch into trunk.
This commit is contained in:
parent
b29860a93c
commit
2b8232b9ab
42 changed files with 63 additions and 57 deletions
|
|
@ -17,7 +17,8 @@ IF(MSVC)
|
|||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../win32/stdint)
|
||||
ENDIF(MSVC)
|
||||
|
||||
INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS} ${PCSC_INCLUDE_DIRS})
|
||||
INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS} ${PCSC_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||
|
||||
ADD_SUBDIRECTORY(lib)
|
||||
ADD_SUBDIRECTORY(examples)
|
||||
ADD_SUBDIRECTORY(include)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue