Fixed build on cmake 2.4.x

3 files changed, 11 insertions, 8 deletions

diff --git a/docs/Changes b/docs/Changes
index c8b8a3393..6f75a142f 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -13,10 +13,10 @@ A Added m_dnsbl and an asynchronous DNS system
 A Added a new language system that uses gettext
 A Added m_mysql which uses threads to execute queries
 A Added many subcommand modules for some commands, eg ns_set_autoop, ns_set_email, etc
-A Added a new logging system that is a bit more flexable
+A Added a new logging system that is a bit more flexible
 A Added cs_set_misc and ns_set_misc to add miscellaneous set commands
 A Added os_modreload, which allows reloading some modules not normally unloable, like the protocol module
-A Added FOUNDER access levels
+A Added FOUNDER access level
 A Made OperServ, Global, MemoServ, and ChanServ optional
 F Shutting down if a config reload fails
 F Autoid to live through restarts on Unreal
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index e7df5cfad..b12d03598 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -3,15 +3,15 @@ set_source_files_properties(version.cpp PROPERTIES LANGUAGE CXX COMPILE_FLAGS "$
 # Generate version executable to modify version.h, setting it's linker flags as well
 add_executable(version version.cpp)
 set_target_properties(version PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
+get_target_property(version_BINARY version LOCATION)
 # Modify version.h from the above executable, with dependencies to the given headers, version.cpp, and all source files in the main Anope build
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h
-  COMMAND version ${Anope_SOURCE_DIR}/src/version.sh ${CMAKE_CURRENT_SOURCE_DIR}/version.h
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp ${SRC_SRCS}
+  COMMAND ${version_BINARY} ${Anope_SOURCE_DIR}/src/version.sh ${CMAKE_CURRENT_SOURCE_DIR}/version.h
+  DEPENDS version ${SRC_SRCS}
 )
 # Add version to list of files for CPack to ignore
-get_target_property(version_BINARY version LOCATION)
 get_filename_component(version_BINARY ${version_BINARY} NAME)
 add_to_cpack_ignored_files("${version_BINARY}$" TRUE)
 
 # Add a custom target to the above file
-add_custom_target(headers DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+add_custom_target(headers DEPENDS version ${CMAKE_CURRENT_BINARY_DIR}/version.h)
diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 19c516b3e..80cbafdf1 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -17,9 +17,12 @@ if(GETTEXT_FOUND)
     # Get the .mo file name
     string(REGEX REPLACE "\\.po$" ".mo" LANG_MO ${LANG_PO})
     # Add the .mo file to a list for use later with add_custom_target
-    append_to_list(LANG_SRCS_MO ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO})
+    set(LANG_SRCS_MO ${LANG_SRCS_MO} ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO})
     # Run msgfmt on the language file, depends on the .po file
-    add_custom_command(OUTPUT ${LANG_MO} COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c ${CMAKE_CURRENT_SOURCE_DIR}/${LANG_PO} -o ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO} MAIN_DEPENDENCY ${LANG_PO})
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO}
+      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -c ${CMAKE_CURRENT_SOURCE_DIR}/${LANG_PO} -o ${CMAKE_CURRENT_BINARY_DIR}/${LANG_MO}
+      MAIN_DEPENDENCY ${LANG_PO}
+    )
     # Add to cpack ignored files if not on Windows.
     file(RELATIVE_PATH LANG_RELATIVE ${Anope_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${LANG_LANG})
     if(NOT WIN32)