Skip to content

Commit

Permalink
Prep for 1.10.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
brndnmtthws committed Jun 22, 2015
1 parent 7733a6d commit 8a4eb26
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -59,7 +59,7 @@ set(HTML_FILES doc/config_settings.html doc/docs.html doc/lua.html doc/variables

set(MAN_PATH "share/man/man1")
set(MAN_FILES doc/conky.1)

install(FILES ${DOC_FILES}
DESTINATION ${DOC_PATH})

Expand Down
4 changes: 3 additions & 1 deletion cmake/Conky.cmake
Expand Up @@ -20,6 +20,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

set(RELEASE true)

# Set system vars
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(OS_LINUX true)
Expand Down Expand Up @@ -112,7 +114,7 @@ else(RELEASE)
set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}_pre${COMMIT_COUNT}")
endif(RELEASE)

set(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2010")
set(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2015")

macro(AC_SEARCH_LIBS FUNCTION_NAME INCLUDES TARGET_VAR)
if("${TARGET_VAR}" MATCHES "^${TARGET_VAR}$")
Expand Down

0 comments on commit 8a4eb26

Please sign in to comment.