kopia lustrzana https://github.com/stlink-org/stlink
[libusb] Added Security framework for macOS
rodzic
978462d048
commit
468b1d2daa
|
@ -209,7 +209,8 @@ if (APPLE) # ... with Apple macOS libraries
|
||||||
find_library(ObjC objc)
|
find_library(ObjC objc)
|
||||||
find_library(CoreFoundation CoreFoundation)
|
find_library(CoreFoundation CoreFoundation)
|
||||||
find_library(IOKit IOKit)
|
find_library(IOKit IOKit)
|
||||||
target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB} ${ObjC} ${CoreFoundation} ${IOKit})
|
find_library(Security Security)
|
||||||
|
target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB} ${ObjC} ${CoreFoundation} ${IOKit} ${Security})
|
||||||
elseif (WIN32) # ... with Windows libraries
|
elseif (WIN32) # ... with Windows libraries
|
||||||
target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB} wsock32 ws2_32)
|
target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB} wsock32 ws2_32)
|
||||||
else ()
|
else ()
|
||||||
|
@ -251,7 +252,8 @@ if (APPLE) # ... with Apple macOS libraries
|
||||||
find_library(ObjC objc)
|
find_library(ObjC objc)
|
||||||
find_library(CoreFoundation CoreFoundation)
|
find_library(CoreFoundation CoreFoundation)
|
||||||
find_library(IOKit IOKit)
|
find_library(IOKit IOKit)
|
||||||
target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB} ${ObjC} ${CoreFoundation} ${IOKit})
|
find_library(Security Security)
|
||||||
|
target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB} ${ObjC} ${CoreFoundation} ${IOKit} ${Security})
|
||||||
elseif (WIN32) # ... with Windows libraries
|
elseif (WIN32) # ... with Windows libraries
|
||||||
target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB} wsock32 ws2_32)
|
target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB} wsock32 ws2_32)
|
||||||
else ()
|
else ()
|
||||||
|
|
|
@ -17,7 +17,7 @@ set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_BINARY_DIR}/dist")
|
||||||
|
|
||||||
if (APPLE) # macOS
|
if (APPLE) # macOS
|
||||||
set(CPACK_GENERATOR "ZIP")
|
set(CPACK_GENERATOR "ZIP")
|
||||||
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-macosx-amd64")
|
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-macos-amd64")
|
||||||
set(CPACK_INSTALL_PREFIX "")
|
set(CPACK_INSTALL_PREFIX "")
|
||||||
|
|
||||||
elseif (WIN32 AND (NOT EXISTS "/etc/debian_version")) # Windows
|
elseif (WIN32 AND (NOT EXISTS "/etc/debian_version")) # Windows
|
||||||
|
|
Ładowanie…
Reference in New Issue