# HG changeset patch # User David Demelier # Date 1565900295 -7200 # Node ID 6baa070e083cb7cecb4cb64c2d2729575c72b3c1 # Parent 98db945aa28cdfe533f92124033b1333d0c8b744 misc: update before 3.0.0 diff -r 98db945aa28c -r 6baa070e083c CHANGES.md --- a/CHANGES.md Thu Aug 15 21:57:24 2019 +0200 +++ b/CHANGES.md Thu Aug 15 22:18:15 2019 +0200 @@ -1,7 +1,7 @@ IRC Client Daemon CHANGES ========================= -irccd current +irccd 3.0.0 2019-08-15 ---------------------- irccd: diff -r 98db945aa28c -r 6baa070e083c cmake/IrccdPackage.cmake --- a/cmake/IrccdPackage.cmake Thu Aug 15 21:57:24 2019 +0200 +++ b/cmake/IrccdPackage.cmake Thu Aug 15 22:18:15 2019 +0200 @@ -16,7 +16,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -set(CPACK_SOURCE_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION}") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION_RAW}") set(CPACK_SOURCE_GENERATOR TXZ ZIP) set(CPACK_SOURCE_IGNORE_FILES "/[.]hg" "/CMakeLists[.]txt[.]user") @@ -46,8 +46,8 @@ set(CPACK_GENERATOR "NSIS") if (IRCCD_64BITS) - set(CPACK_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION}-amd64") + set(CPACK_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION_RAW}-amd64") else () - set(CPACK_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION}-x86") + set(CPACK_PACKAGE_FILE_NAME "irccd-${IRCCD_VERSION_RAW}-x86") endif () endif () diff -r 98db945aa28c -r 6baa070e083c cmake/IrccdVersion.cmake --- a/cmake/IrccdVersion.cmake Thu Aug 15 21:57:24 2019 +0200 +++ b/cmake/IrccdVersion.cmake Thu Aug 15 22:18:15 2019 +0200 @@ -31,7 +31,8 @@ set(IRCCD_VERSION_MAJOR "3") set(IRCCD_VERSION_MINOR "0") set(IRCCD_VERSION_PATCH "0") -set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}-dev${HG_REV}") +set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}${HG_REV}") +set(IRCCD_VERSION_RAW "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}") set(IRCCD_VERSION_SHLIB "1") # @@ -42,9 +43,9 @@ # IRCCD_RELEASE_DATE_DAY 2 digits (01 = first day of month) # set(IRCCD_RELEASE_DATE_YEAR 2019) -set(IRCCD_RELEASE_DATE_MONTH 09) -set(IRCCD_RELEASE_DATE_DAY 26) +set(IRCCD_RELEASE_DATE_MONTH 08) +set(IRCCD_RELEASE_DATE_DAY 15) set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}") # Irccd release data (manual version). -set(IRCCD_MAN_DATE "September 26, 2019") +set(IRCCD_MAN_DATE "August 15, 2019") diff -r 98db945aa28c -r 6baa070e083c cmake/function/IrccdDefineLibrary.cmake --- a/cmake/function/IrccdDefineLibrary.cmake Thu Aug 15 21:57:24 2019 +0200 +++ b/cmake/function/IrccdDefineLibrary.cmake Thu Aug 15 22:18:15 2019 +0200 @@ -30,7 +30,7 @@ # HEADERS (Optional) directory of headers to install # FLAGS (Optional) C/C++ flags (without -D) # LIBRARIES (Optional) libraries to link -# LOCAL_INCLUDES (Optional) local includes for the target only +# PRIVATE_INCLUDES (Optional) local includes for the target only # PUBLIC_INCLUDES (Optional) includes to share with target dependencies # ) # @@ -43,7 +43,7 @@ # The argument SOURCES should contains the C++ source files and HEADERS should # points to a directory to be installed verbatim in the include directory. # -# Optional argument FLAGS, LOCAL_INCLUDES, PUBLIC_INCLUDES, LIBRARIES may be +# Optional argument FLAGS, PRIVATE_INCLUDES, PUBLIC_INCLUDES, LIBRARIES may be # passed to set compile flags, private includes, public includes and libraries # respectively. # @@ -55,7 +55,7 @@ function(irccd_define_library) set(options EXPORT) set(oneValueArgs TARGET) - set(multiValueArgs HEADERS SOURCES FLAGS LIBRARIES LOCAL_INCLUDES PUBLIC_INCLUDES) + set(multiValueArgs HEADERS SOURCES FLAGS LIBRARIES PRIVATE_INCLUDES PUBLIC_INCLUDES) cmake_parse_arguments(LIB "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -69,7 +69,7 @@ add_library(${LIB_TARGET} ${LIB_SOURCES} ${LIB_HEADERS}) target_include_directories( ${LIB_TARGET} - PRIVATE ${LIB_LOCAL_INCLUDES} + PRIVATE ${LIB_PRIVATE_INCLUDES} PUBLIC ${LIB_PUBLIC_INCLUDES} ) target_compile_definitions( diff -r 98db945aa28c -r 6baa070e083c doc/doxygen/pages.dox --- a/doc/doxygen/pages.dox Thu Aug 15 21:57:24 2019 +0200 +++ b/doc/doxygen/pages.dox Thu Aug 15 22:18:15 2019 +0200 @@ -364,7 +364,7 @@ * HEADERS (Optional) directory of headers to install * FLAGS (Optional) C/C++ flags (without -D) * LIBRARIES (Optional) libraries to link - * LOCAL_INCLUDES (Optional) local includes for the target only + * PRIVATE_INCLUDES (Optional) local includes for the target only * PUBLIC_INCLUDES (Optional) includes to share with target dependencies * ) * ``` @@ -378,8 +378,9 @@ * The argument SOURCES should contains the C++ source files and HEADERS should * points to a directory to be installed verbatim in the include directory. * - * Optional argument FLAGS, LOCAL_INCLUDES, PUBLIC_INCLUDES may be passed to set - * compile flags, private includes, public includes and libraries respectively. + * Optional argument FLAGS, PRIVATE_INCLUDES, PUBLIC_INCLUDES may be passed to + * set compile flags, private includes, public includes and libraries + * respectively. * * If export boolean parameter is set, the library is exported and installed. *