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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd329bb..d61a0ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,9 @@ cmake_minimum_required(VERSION 2.8.7)
 include(CheckCCompilerFlag)
 find_package(PkgConfig)
 
-pkg_check_modules(libusb REQUIRED libusb-1.0)
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/cmake/modules")
+
+find_package(LibUSB REQUIRED)
 pkg_check_modules(gtk gtk+-3.0)
 
 function(add_cflag_if_supported flag)
@@ -38,44 +40,58 @@ add_cflag_if_supported("-Wundef")
 add_cflag_if_supported("-fPIC")
 
 if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    include(CTest)
-    add_cflag_if_supported("-ggdb")
-    add_cflag_if_supported("-O0")
+	include(CTest)
+	add_cflag_if_supported("-ggdb")
+	add_cflag_if_supported("-O0")
 elseif()
-    add_cflag_if_supported("-O2")
+	add_cflag_if_supported("-O2")
 endif()
 
-set(HFILES src/stlink-common.h
-           src/stlink-usb.h
-           src/stlink-sg.h
-           src/uglylogging.h
-           src/mmap.h)
+set(STLINK_HEADERS
+	include/stlink.h
+	include/stlink/usb.h
+	include/stlink/sg.h
+	include/stlink/logging.h
+	include/stlink/mmap.h
+	include/stlink/chipid.h
+	include/stlink/flash_loader.h
+)
 
-set(CFILES src/stlink-common.c
-           src/stlink-usb.c
-           src/stlink-sg.c
-           src/uglylogging.c
-           )
+set(STLINK_SOURCE
+	src/chipid.c
+	src/common.c
+	src/usb.c
+	src/sg.c
+	src/logging.c
+	src/flash_loader.c
+)
 
-include_directories(${libusb_INCLUDE_DIRS})
-include_directories(src)
-include_directories(mingw)
+include_directories(${LIBUSB_INCLUDE_DIR})
+include_directories(include)
+include_directories(src/mingw)
 
 add_library(${PROJECT_NAME} STATIC
-            ${HFILES} # header files for ide projects generated by cmake
-            ${CFILES})
-target_link_libraries(${PROJECT_NAME} ${libusb_LDFLAGS})
+            ${STLINK_HEADERS} # header files for ide projects generated by cmake
+            ${STLINK_SOURCE})
+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 flash/main.c)
+add_executable(st-flash src/tools/flash.c)
 target_link_libraries(st-flash ${PROJECT_NAME})
 
-add_executable(st-info src/st-info.c)
+add_executable(st-info src/tools/info.c)
 target_link_libraries(st-info ${PROJECT_NAME})
 
-add_executable(st-util gdbserver/gdb-remote.c
-                       gdbserver/gdb-remote.h
-                       gdbserver/gdb-server.c
-                       gdbserver/gdb-server.h)
+add_executable(st-util src/gdbserver/gdb-remote.c
+                       src/gdbserver/gdb-remote.h
+                       src/gdbserver/gdb-server.c
+                       src/gdbserver/gdb-server.h)
 target_link_libraries(st-util ${PROJECT_NAME})
 
 install(TARGETS ${PROJECT_NAME} st-flash st-util st-info
@@ -84,8 +100,8 @@ install(TARGETS ${PROJECT_NAME} st-flash st-util st-info
 )
 
 if(NOT MINGW)
-  list(APPEND CFILES src/st-term.c)
-  add_executable(st-term src/st-term.c)
+  list(APPEND STLINK_SOURCE src/tools/term.c)
+  add_executable(st-term src/tools/term.c)
   target_link_libraries(st-term ${PROJECT_NAME})
 
   install(TARGETS st-term
@@ -94,8 +110,8 @@ endif()
 
 if(gtk_FOUND)
   include_directories(${gtk_INCLUDE_DIRS})
-  set(GUI_SOURCES gui/stlink-gui.c
-                  gui/stlink-gui.h)
+  set(GUI_SOURCES src/tools/gui/stlink-gui.c
+                  src/tools/gui/stlink-gui.h)
 
   add_executable(stlink-gui-local ${GUI_SOURCES})
   set_target_properties(stlink-gui-local PROPERTIES
@@ -110,6 +126,8 @@ if(gtk_FOUND)
 
   install(TARGETS stlink-gui
           RUNTIME DESTINATION bin)
-  install(FILES gui/stlink-gui.ui
+  install(FILES src/tools/gui/stlink-gui.ui
           DESTINATION ${INSTALLED_UI_DIR})
 endif()
+
+add_subdirectory(tests)