From 4fb2eefac2a18ba62851f4cd848113571ba160c2 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 19 Jun 2017 18:08:13 +0300 Subject: [PATCH 1/2] build,cmake: rename libjson-c-static.a to libjson-c.a Signed-off-by: Alexandru Ardelean --- .gitignore | 2 +- CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 33649ca..0a788b6 100644 --- a/.gitignore +++ b/.gitignore @@ -105,5 +105,5 @@ /CMakeFiles /cmake_install.cmake /include -/libjson-c-static.a +/libjson-c.a /libjson-c.so diff --git a/CMakeLists.txt b/CMakeLists.txt index f93c0e6..2d1f31e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ add_library(json-c-static ) set_property(TARGET json-c PROPERTY C_STANDARD 99) +set_target_properties(json-c-static PROPERTIES OUTPUT_NAME json-c) install(TARGETS json-c json-c-static RUNTIME DESTINATION bin From 8f6ecbf37b7323dc81214aca5ecd684ff2b393bb Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Mon, 19 Jun 2017 18:12:03 +0300 Subject: [PATCH 2/2] build,cmake: set C_STANDARD 99 property to libjson-c-static Apply the same property as to json-c. Signed-off-by: Alexandru Ardelean --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d1f31e..b97a77f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ add_library(json-c-static ) set_property(TARGET json-c PROPERTY C_STANDARD 99) +set_property(TARGET json-c-static PROPERTY C_STANDARD 99) set_target_properties(json-c-static PROPERTIES OUTPUT_NAME json-c) install(TARGETS json-c json-c-static