X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=CMakeLists.txt;h=d61a0aee39553e0176fc87bb217297fd8c53394a;hb=refs%2Fheads%2Fupstream;hp=89bd8596874fe9f277b942aefd2f89c02d9d2af8;hpb=de1f05ce8150ae9cee92a9ddbf471b718ea81095;p=fw%2Fstlink

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89bd859..d61a0ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ set(STLINK_HEADERS
 	include/stlink/logging.h
 	include/stlink/mmap.h
 	include/stlink/chipid.h
+	include/stlink/flash_loader.h
 )
 
 set(STLINK_SOURCE
@@ -62,6 +63,7 @@ set(STLINK_SOURCE
 	src/usb.c
 	src/sg.c
 	src/logging.c
+	src/flash_loader.c
 )
 
 include_directories(${LIBUSB_INCLUDE_DIR})
@@ -71,7 +73,14 @@ include_directories(src/mingw)
 add_library(${PROJECT_NAME} STATIC
             ${STLINK_HEADERS} # header files for ide projects generated by cmake
             ${STLINK_SOURCE})
-target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARY})
+
+if (APPLE)
+	find_library(ObjC objc)
+	find_library(CoreFoundation CoreFoundation)
+	find_library(IOKit IOKit)
+	target_link_libraries(${PROJECT_NAME} ${CoreFoundation} ${IOKit} ${ObjC})
+endif()
 
 add_executable(st-flash src/tools/flash.c)
 target_link_libraries(st-flash ${PROJECT_NAME})
@@ -120,3 +129,5 @@ if(gtk_FOUND)
   install(FILES src/tools/gui/stlink-gui.ui
           DESTINATION ${INSTALLED_UI_DIR})
 endif()
+
+add_subdirectory(tests)