Align loader to 32-bit boundary

[fw/stlink] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 247e515a9e9209996b645c3ff1c0f81a68a50368..d26f03c8ffe7f490164d74c4e40937ea02069637 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,51 @@
-cmake_minimum_required(VERSION 2.8.11)
-project(stlink)
+project(stlink C)
+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)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra")
+function(add_cflag_if_supported flag)
+    string(REPLACE "-" "_" flagclean ${flag})
+    string(REPLACE "=" "_" flagclean ${flagclean})
+    string(REPLACE "+" "_" flagclean ${flagclean})
+    string(REPLACE "," "_" flagclean ${flagclean})
+    string(TOUPPER ${flagclean} flagclean)
+
+    check_c_compiler_flag(${flag} C_SUPPORTS${flagclean})
+
+    if (C_SUPPORTS${flagclean})
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+add_cflag_if_supported("-std=gnu99")
+add_cflag_if_supported("-Wall")
+add_cflag_if_supported("-Wextra")
+add_cflag_if_supported("-Wshadow")
+add_cflag_if_supported("-D_FORTIFY_SOURCE=2")
+add_cflag_if_supported("-fstrict-aliasing")
+add_cflag_if_supported("-Wformat")
+add_cflag_if_supported("-Wformat-security")
+add_cflag_if_supported("-Wmaybe-uninitialized")
+add_cflag_if_supported("-Wmissing-variable-declarations")
+add_cflag_if_supported("-Wshorten-64-to-32")
+add_cflag_if_supported("-Wimplicit-function-declaration")
+add_cflag_if_supported("-Wredundant-decls")
+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")
+elseif()
+    add_cflag_if_supported("-O2")
+endif()
 
 set(HFILES src/stlink-common.h
            src/stlink-usb.h
@@ -18,40 +57,38 @@ set(CFILES src/stlink-common.c
            src/stlink-usb.c
            src/stlink-sg.c
            src/uglylogging.c
-           src/st-info.c)
+           )
 
-include_directories(${libusb_INCLUDE_DIRS})
+include_directories(${LIBUSB_INCLUDE_DIR})
 include_directories(src)
 include_directories(mingw)
 
-add_library(stlink STATIC
+add_library(${PROJECT_NAME} STATIC
             ${HFILES} # header files for ide projects generated by cmake
             ${CFILES})
-target_link_libraries(stlink ${libusb_LDFLAGS})
+target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES})
 
 add_executable(st-flash flash/main.c)
-target_link_libraries(st-flash stlink)
+target_link_libraries(st-flash ${PROJECT_NAME})
+
+add_executable(st-info src/st-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)
-target_link_libraries(st-util stlink)
+target_link_libraries(st-util ${PROJECT_NAME})
 
-add_executable(st-info src/st-info.c)
-target_link_libraries(st-info stlink)
-
-add_executable(st-probe src/st-probe.c)
-target_link_libraries(st-probe stlink)
-
-install(TARGETS  stlink st-flash st-util st-info st-probe
+install(TARGETS ${PROJECT_NAME} st-flash st-util st-info
         RUNTIME DESTINATION bin
-        ARCHIVE DESTINATION lib)
+        ARCHIVE DESTINATION lib
+)
 
 if(NOT MINGW)
   list(APPEND CFILES src/st-term.c)
   add_executable(st-term src/st-term.c)
-  target_link_libraries(st-term stlink)
+  target_link_libraries(st-term ${PROJECT_NAME})
 
   install(TARGETS st-term
           RUNTIME DESTINATION bin)
@@ -78,4 +115,3 @@ if(gtk_FOUND)
   install(FILES gui/stlink-gui.ui
           DESTINATION ${INSTALLED_UI_DIR})
 endif()
-