CMakeLists.txt: Clean up remaining stuff in CMakeLists.txt

Signed-off-by: Andrew Andrianov <andrew@ncrmnt.org>

CMakeLists.txt

@@ -164,11 +164,11 @@ endif()
 set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${STLINK_PACKAGE_VERSION_MAJOR}
 VERSION ${STLINK_SHARED_VERSION})
 
-add_library(${PROJECT_NAME}static STATIC
+add_library(${PROJECT_NAME}-static STATIC
             ${STLINK_HEADERS} # header files for ide projects generated by cmake
             ${STLINK_SOURCE})
-target_link_libraries(${PROJECT_NAME}static ${LIBUSB_LIBRARY})
-set_target_properties(${PROJECT_NAME}static PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+target_link_libraries(${PROJECT_NAME}-static ${LIBUSB_LIBRARY})
+set_target_properties(${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
 
 if (APPLE)
 	find_library(ObjC objc)
@@ -195,7 +195,7 @@ else ()
 	target_link_libraries(st-util ${PROJECT_NAME})
 endif ()
 
-install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}static st-flash st-util st-info
+install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}-static st-flash st-util st-info
         RUNTIME DESTINATION bin
         ARCHIVE DESTINATION lib/${CMAKE_LIBRARY_PATH}
 		LIBRARY DESTINATION lib/${CMAKE_LIBRARY_PATH}

doc/app-example/CMakeLists.txt

@@ -1,23 +1,28 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+# Warning: This example assumes that you are building on a host
+# with pkg-config available (e.g. linux). The logic required to
+# build under windows/mingw and/or mac was intentionally omitted
+# to keep this CMakeLists as small as possible
 
-PROJECT(st-hello)
-SET(PROJECT_VERSION   0.1)
-SET(SRCS main.c)
+cmake_minimum_required(VERSION 2.8)
 
-FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(STLINK REQUIRED stlink)
+project(st-hello)
+set(PROJECT_VERSION   0.1)
+set(SRCS main.c)
 
-SET(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall -Werror")
+find_package(PkgConfig)
+pkg_check_modules(STLINK REQUIRED stlink)
 
-INCLUDE_DIRECTORIES(
+set(CMAKE_C_FLAGS " ${STLINK_CFLAGS_OTHER} -Wall -Werror")
+
+include_directories(
     ${STLINK_INCLUDE_DIRS}
 )
 
-ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+add_executable(${PROJECT_NAME} ${SRCS})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}
+target_link_libraries(${PROJECT_NAME}
     ${STLINK_LIBRARIES}
 )
 
-INSTALL(TARGETS ${PROJECT_NAME}
+install(TARGETS ${PROJECT_NAME}
         DESTINATION bin)