# HG changeset patch
# User Mitchell Kember <mk12360@gmail.com>
# Date 1354488362 18000
# Node ID 6d1bf7aec084ad55547474142484fa108722acf4
# Parent  81da6576b0c31dab07f6c5b2c442a6cce5105b30# Parent  4c166505e5c81e1328964bce1e32345ed6bddd37
Merged koda's fix for the hwengine bug.

eG: --

diff -r 81da6576b0c3 -r 6d1bf7aec084 cmake_modules/FindFreepascal.cmake
--- a/cmake_modules/FindFreepascal.cmake	Sun Dec 02 17:44:34 2012 -0500
+++ b/cmake_modules/FindFreepascal.cmake	Sun Dec 02 17:46:02 2012 -0500
@@ -29,6 +29,6 @@
 if (TEST_NOEXECSTACK)
     set(NOEXECSTACK_FLAGS "")
     message(STATUS "Checking whether linker needs explicit noexecstack -- no")
-else()
+else(TEST_NOEXECSTACK)
     message(STATUS "Checking whether linker needs explicit noexecstack -- yes")
-endif()
+endif(TEST_NOEXECSTACK)
diff -r 81da6576b0c3 -r 6d1bf7aec084 hedgewars/CMakeLists.txt
--- a/hedgewars/CMakeLists.txt	Sun Dec 02 17:44:34 2012 -0500
+++ b/hedgewars/CMakeLists.txt	Sun Dec 02 17:46:02 2012 -0500
@@ -111,7 +111,7 @@
 find_package(Freepascal)
 
 if (FPC_VERSION VERSION_LESS required_fpc_version)
-    message(FATAL_ERROR "Necessary FPC version not found (version >= ${required_fpc_version} required)")
+    message(FATAL_ERROR "Necessary FPC version not found (required version = ${required_fpc_version})")
 else()
     message(STATUS "Found FPC: ${FPC_EXECUTABLE} (version ${FPC_VERSION})")
 endif()
@@ -165,7 +165,7 @@
 
 
 #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6
-if(fpc_version LESS "020600")
+if(FPC_VERSION LESS "020600")
     #under some configurations CMAKE_BUILD_TOOL fails to pass on the jobserver, breaking parallel compilation
     #TODO: check if this is needed on windows too
     if(UNIX)
@@ -206,12 +206,12 @@
 
 set(pascal_flags "-Fl${LIBRARY_OUTPUT_PATH}" ${pascal_flags})
 
-set(fpc_flags ${noexecstack_flags} ${pascal_flags} ${hwengine_project})
+set(fpc_flags ${NOEXECSTACK_FLAGS} ${pascal_flags} ${hwengine_project})
 
 if(NOT APPLE)
     #here is the command for standard executables or for shared library
     add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}"
-        COMMAND "${fpc_executable}"
+        COMMAND "${FPC_EXECUTABLE}"
         ARGS ${fpc_flags}
         MAIN_DEPENDENCY ${hwengine_project}
         DEPENDS ${engine_sources}
@@ -221,7 +221,7 @@
     foreach (build_arch ${powerpc_build} ${i386_build} ${x86_64_build})
         set(lipo_args_list "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}" ${lipo_args_list})
         add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}"
-            COMMAND "${fpc_executable}"
+            COMMAND "${FPC_EXECUTABLE}"
             ARGS ${fpc_flags} -ohwengine.${build_arch} -P${build_arch}
             MAIN_DEPENDENCY ${hwengine_project}
             DEPENDS ${engine_sources}
@@ -254,7 +254,7 @@
 endif()
 
 #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6
-if((fpc_version LESS "020600") AND (NOVIDEOREC OR NOT ${FFMPEG_FOUND}))
+if((FPC_VERSION LESS "020600") AND (NOVIDEOREC OR NOT ${FFMPEG_FOUND}))
     add_dependencies(${engine_output_name} ENGINECLEAN)
 endif()