Peter M. Groen / openhantek

Commit 225d2d903f9952056b5de5cb277632acef15f413

Authored by David Gräff
1 parent acf972a9

Add libusb windows lib for windows builds

Inline Side-by-side
Showing 3 changed files with 17 additions and 13 deletions
cmake/libusb-1.0.21-win.7z 0 → 100644
View file @225d2d9
No preview for this file type
cmake/libusb_on_windows.cmake
  View file @225d2d9
1 -message("Download libusb1.0")  
2 -if (NOT EXISTS "${CMAKE_BINARY_DIR}/libusb.7z")  
3 - file(DOWNLOAD "http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.7z?r=http%3A%2F%2Flibusb.info%2F&ts=1457005849&use_mirror=vorboss"  
4 - "${CMAKE_BINARY_DIR}/libusb.7z" )  
5 -endif()  
6 - 1 +#message("Download libusb1.0")
  2 +#if (NOT EXISTS "${CMAKE_BINARY_DIR}/libusb.7z")
  3 +# file(DOWNLOAD "http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.7z?r=http%3A%2F%2Flibusb.info%2F&ts=1457005849&use_mirror=vorboss"
  4 +# "${CMAKE_BINARY_DIR}/libusb.7z" )
  5 +#endif()
7 6
8 -file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/libusb") 7 +set(filename "${CMAKE_CURRENT_LIST_DIR}/libusb-1.0.21-win.7z")
  8 +set(LIBUSB_DIR "${CMAKE_BINARY_DIR}/libusb-1.0.21-win")
9 9
10 execute_process( 10 execute_process(
11 -COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_BINARY_DIR}/libusb.7z  
12 -WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/libusb" 11 +COMMAND ${CMAKE_COMMAND} -E tar xzf "${filename}"
  12 +WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
13 ) 13 )
14 14
  15 +set(ARCH "")
15 if (CMAKE_SIZEOF_VOID_P EQUAL 4) 16 if (CMAKE_SIZEOF_VOID_P EQUAL 4)
16 - target_link_libraries(${PROJECT_NAME} "${CMAKE_BINARY_DIR}/libusb/MinGW32/static/libusb-1.0.a") 17 + set(ARCH "32")
17 elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) 18 elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
18 - target_link_libraries(${PROJECT_NAME} "${CMAKE_BINARY_DIR}/libusb/MinGW64/static/libusb-1.0.a") 19 + set(ARCH "64")
19 else() 20 else()
20 message(FATAL_ERROR "Target architecture not known") 21 message(FATAL_ERROR "Target architecture not known")
21 endif() 22 endif()
22 23
23 -include_directories("${CMAKE_BINARY_DIR}/libusb/include" "${CMAKE_BINARY_DIR}/libusb/include/libusb-1.0") 24 +target_link_libraries(${PROJECT_NAME} "${LIBUSB_DIR}/${ARCH}/libusb-1.0.lib")
  25 +file(COPY "${LIBUSB_DIR}/${ARCH}/libusb-1.0.dll" DESTINATION "${CMAKE_BINARY_DIR}")
  26 +
  27 +include_directories("${LIBUSB_DIR}" "${LIBUSB_DIR}/libusb-1.0")
openhantek/CMakeLists.txt
  View file @225d2d9
@@ -23,7 +23,7 @@ add_subdirectory(res) @@ -23,7 +23,7 @@ add_subdirectory(res)
23 add_definitions(-DVERSION="${CPACK_PACKAGE_VERSION}") 23 add_definitions(-DVERSION="${CPACK_PACKAGE_VERSION}")
24 24
25 # make executable 25 # make executable
26 -add_executable(${PROJECT_NAME} ${SRC} ${HEADERS} ${QRC} ${TRANSLATION_BIN_FILES} ${TRANSLATION_QRC}) 26 +add_executable(${PROJECT_NAME} ${SRC} ${HEADERS} ${QRC} ${TRANSLATION_BIN_FILES} ${TRANSLATION_QRC} ${VS_FIX_FILES})
27 target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL ${OPENGL_LIBRARIES} ) 27 target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL ${OPENGL_LIBRARIES} )
28 target_compile_features(${PROJECT_NAME} PRIVATE cxx_range_for) 28 target_compile_features(${PROJECT_NAME} PRIVATE cxx_range_for)
29 if(MSVC) 29 if(MSVC)