From 889280c9766732d207ac7fc2e0ab8529271a29d9 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Fri, 16 Sep 2016 07:55:35 +0300 Subject: [PATCH 1/3] Don't include jansson_config.h in dist tarballs Fixes #306 --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index f0fd343..993f196 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ EXTRA_DIST = jansson.def -include_HEADERS = jansson.h jansson_config.h +include_HEADERS = jansson.h +nodist_include_HEADERS = jansson_config.h lib_LTLIBRARIES = libjansson.la libjansson_la_SOURCES = \ From bdaf7584dbc48056df9f5c81dc3c0a086f30efe5 Mon Sep 17 00:00:00 2001 From: Yuriy Romanenko Date: Wed, 7 Sep 2016 10:06:26 -0700 Subject: [PATCH 2/3] Added test files to .gitignore --- test/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/.gitignore b/test/.gitignore index ae6c8f9..58e5e31 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -15,3 +15,7 @@ suites/api/test_pack suites/api/test_simple suites/api/test_unpack suites/api/test_load_callback +run-suites.log +run-suites.trs +test-suite.log + From e9fcab08fbe0825119c48f547dece60bd4e60c20 Mon Sep 17 00:00:00 2001 From: Matthew Johnston Date: Sun, 11 Sep 2016 00:04:49 -0500 Subject: [PATCH 3/3] Add install targets to be optional --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index da844a9..8808070 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -655,6 +655,8 @@ set_target_properties(jansson PROPERTIES PUBLIC_HEADER "${JANSSON_HDR_PUBLIC}") # # Install targets. # +option(JANSSON_INSTALL "Generate installation target" ON) +if (JANSSON_INSTALL) install(TARGETS jansson EXPORT JanssonTargets LIBRARY DESTINATION "${JANSSON_INSTALL_LIB_DIR}" COMPONENT lib @@ -676,6 +678,7 @@ install(FILES # Install exports for the install-tree. install(EXPORT JanssonTargets DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}" COMPONENT dev) +endif() # For use when simply using add_library from a parent project to build jansson. set(JANSSON_LIBRARIES jansson CACHE STRING "Jansson libraries")