未验证 提交 3f334b8b 编写于 作者: M Mark VanderVoord 提交者: GitHub

Merge pull request #450 from arcadien/fix_comments

Fix CMakeLists
###################################################################################
# #
# NAME: CMakeLsits.txt #
# NAME: CMakeLists.txt #
# #
# AUTHOR: Mike Karlesky, Mark VanderVoord, Greg Williams. #
# WRITTEN BY: Michael Brockus. #
......@@ -13,11 +13,8 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
project(unity LANGUAGES C DESCRIPTION "C Unit testing framework.")
add_subdirectory("src")
target_include_directories("unity"
add_subdirectory(src)
target_include_directories(unity
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
"$<INSTALL_INTERFACE:src>"
......@@ -25,15 +22,9 @@ target_include_directories("unity"
PRIVATE "src"
)
add_library("unity::framework" ALIAS "unity")
install(TARGETS "unity" EXPORT "unityConfig"
ARCHIVE DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_BINDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_LIBDIR}")
add_library(unity::framework ALIAS unity)
install(DIRECTORY src/ DESTINATION src)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/ DESTINATION src)
install(EXPORT unityConfig DESTINATION share/unityConfig/cmake)
# This makes the project importable from the build directory
......
......@@ -8,9 +8,15 @@
# License: MIT #
# #
###################################################################################
cmake_minimum_required(VERSION 3.13.2.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
add_library("unity" STATIC)
add_library(unity STATIC "unity.c")
install(TARGETS unity EXPORT unityConfig
ARCHIVE DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_INSTALL_BINDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_LIBDIR}")
target_sources("unity" PRIVATE "unity.c")
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册