Skip to content

Commit

Permalink
add cmake option to enable cpack when quill is not master project
Browse files Browse the repository at this point in the history
  • Loading branch information
odygrd committed Apr 24, 2020
1 parent a6a70f9 commit 61a3e81
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
- [v1.3.0](#v1.3.0)
- [v1.2.2](#v1.2.2)
- [v1.2.1](#v1.2.1)
- [v1.2.0](#v1.2.0)
- [v1.1.0](#v1.1.0)
- [v1.0.0](#v1.0.0)

## v1.3.0
## v1.2.2
* Support for `arm/arm64`. ([#19](https://github.com/odygrd/quill/issues/19))
* Add a cmake option `QUILL_ENABLE_INSTALL` to enable cpack

## v1.2.1
* Improved `QUILL_RDTSC_CLOCK` tweak option. It is now possible to switch between using `rdtsc` or `std::chrono` clock without having to recompile quill as library.
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ option(QUILL_USE_VALGRIND "Use valgrind as the default memcheck tool in CTest (R

option(QUILL_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)

option(QUILL_ENABLE_INSTALL "Enable CMake Install when Quill is not a master project" OFF)

#-------------------------------------------------------------------------------------------------------
# Use newer policies if possible, up to most recent tested version of CMake.
#-------------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion quill/quill/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ if (QUILL_BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
add_subdirectory(test)
endif ()

if (QUILL_MASTER_PROJECT)
if (QUILL_MASTER_PROJECT OR QUILL_ENABLE_INSTALL)
# ---- Install ---- #
include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
Expand Down

0 comments on commit 61a3e81

Please sign in to comment.