Align loader to 32-bit boundary

[fw/stlink] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cae6bd1398bd06c293966612587cb8bc3b20d76f..d26f03c8ffe7f490164d74c4e40937ea02069637 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,12 @@
-cmake_minimum_required(VERSION 2.8.11)
 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)
 
 function(add_cflag_if_supported flag)
@@ -35,6 +37,7 @@ 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)
@@ -54,16 +57,16 @@ 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(${PROJECT_NAME} STATIC
             ${HFILES} # header files for ide projects generated by cmake
             ${CFILES})
-target_link_libraries(${PROJECT_NAME} ${libusb_LDFLAGS})
+target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES})
 
 add_executable(st-flash flash/main.c)
 target_link_libraries(st-flash ${PROJECT_NAME})
@@ -71,16 +74,13 @@ 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-probe src/st-probe.c)
-target_link_libraries(st-probe ${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 ${PROJECT_NAME})
 
-install(TARGETS ${PROJECT_NAME} st-flash st-util st-info st-probe
+install(TARGETS ${PROJECT_NAME} st-flash st-util st-info
         RUNTIME DESTINATION bin
         ARCHIVE DESTINATION lib
 )