fix #5329: apply patch to fix cmake errors (thanks susnux!)

spring · Aug 2, 2016 · 0c78726 · 0c78726
1 parent 5f0b19e
commit 0c78726
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/AI/Wrappers/CUtils/CMakeLists.txt b/AI/Wrappers/CUtils/CMakeLists.txt
@@ -17,5 +17,6 @@ set(mySources
 	"${mySourceDir}/TimeUtil.cpp"
 	)
 add_library(CUtils STATIC ${mySources})
+target_link_libraries(CUtils ${CMAKE_DL_LIBS})
 
 AIMessage(STATUS "Found AI Wrapper: ${myName} (sources only wrapper)")
diff --git a/rts/build/cmake/FindAsciiDoc.cmake b/rts/build/cmake/FindAsciiDoc.cmake
@@ -40,6 +40,8 @@ find_file(DOCBOOK_XSL
 	PATHS /usr /usr/share /usr/local /usr/local/share
 	PATH_SUFFIXES
 		xml/docbook/stylesheet/nwalsh/manpages
+		xml/docbook/stylesheet/nwalsh/1.78.1/manpages
+		xml/docbook/stylesheet/nwalsh/1.79.0/manpages
 		sgml/docbook/xsl-stylesheets/manpages
 		xsl/docbook/manpages
 	DOC "DocBook XSL Style-Sheet"

diff --git a/rts/build/cmake/TestCXXFlags.cmake b/rts/build/cmake/TestCXXFlags.cmake
@@ -161,7 +161,7 @@ if   (CMAKE_COMPILER_IS_GNUCXX)
 		ERROR_VARIABLE linkerVersion
 	)
 	set(hasGold FALSE)
-	if (${linkerVersion} MATCHES "gold")
+	if ("${linkerVersion}" MATCHES "gold")
 		set(hasGold TRUE)
 	endif()