Merge 992f1c56ca7663357911c24843834a88ef98d8dc into 42de50f2b7bd4c43e3b92f5c9d6a996fd5300e4f
This commit is contained in:
commit
1ee477033e
@ -74,7 +74,7 @@ IF(LIBNFC_LOG)
|
|||||||
LIST(APPEND LIBRARY_SOURCES log log-internal)
|
LIST(APPEND LIBRARY_SOURCES log log-internal)
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
ENDIF(LIBNFC_LOG)
|
ENDIF(LIBNFC_LOG)
|
||||||
ADD_LIBRARY(nfc SHARED ${LIBRARY_SOURCES})
|
ADD_LIBRARY(nfc ${LIBRARY_SOURCES})
|
||||||
|
|
||||||
IF(PCSC_FOUND)
|
IF(PCSC_FOUND)
|
||||||
TARGET_LINK_LIBRARIES(nfc ${PCSC_LIBRARIES})
|
TARGET_LINK_LIBRARIES(nfc ${PCSC_LIBRARIES})
|
||||||
@ -111,6 +111,6 @@ IF(WIN32)
|
|||||||
# At compile time we need the .LIB file, we place it in the lib directory
|
# At compile time we need the .LIB file, we place it in the lib directory
|
||||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.lib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.lib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
INSTALL(TARGETS nfc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
INSTALL(TARGETS nfc ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user