changeset 855:01e4e479754c v4.2

cmake: no need for a separate libversion Since libblahg is a static lib, it can include the version info directly. Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Mon, 17 Apr 2017 11:34:24 -0400
parents 45c3000115d9
children f5d0dc5dea9f
files .hgignore CMakeLists.txt
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Mon Apr 17 09:33:37 2017 -0400
+++ b/.hgignore	Mon Apr 17 11:34:24 2017 -0400
@@ -9,7 +9,6 @@
 test_qstring
 test_lisp_parser
 
-libversion.a
 hgversion.h
 
 post_fmt3.lex.c
--- a/CMakeLists.txt	Mon Apr 17 09:33:37 2017 -0400
+++ b/CMakeLists.txt	Mon Apr 17 11:34:24 2017 -0400
@@ -65,12 +65,9 @@
 		-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/hg.cmake
 )
 
-add_library(version
+add_library(blahg
 	version.c
-)
-add_dependencies(version revisiontag)
 
-add_library(blahg
 	# file caching & change monitoring
 	file_cache.c
 
@@ -107,6 +104,8 @@
 	sidebar.c
 )
 
+add_dependencies(blahg revisiontag)
+
 target_link_libraries(blahg
 	md
 	avl
@@ -132,7 +131,6 @@
 )
 
 target_link_libraries(blahgd
-	version
 	blahg
 	pthread
 	socket
@@ -145,7 +143,6 @@
 )
 
 target_link_libraries(mathd
-	version
 	blahg
 )