CMake stuff works now on linux and windows... and should be possible to make to work on OS X.

2 files changed, 58 insertions, 16 deletions

diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
index c39a8cbfb..246e72cfb 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
@@ -1,28 +1,54 @@
-MESSAGE(STATUS "IRRDIR = $ENV{IRRDIR}")
+#FindIrrlicht.cmake
+
+set(IRRLICHT_SOURCE_DIR "" CACHE PATH "Path to irrlicht source directory (optional)")
+
+if( UNIX )
+	# Unix
+else( UNIX )
+	# Windows
+endif( UNIX )
+
+# Find include directory
 
 FIND_PATH(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
-   PATHS
-   $ENV{IRRDIR}/include
-   /usr/local/include/irrlicht
-   /usr/include/irrlicht
+	PATHS
+	/usr/local/include/irrlicht
+	/usr/include/irrlicht
+	"${IRRLICHT_SOURCE_DIR}/include"
 )
 
-MESSAGE(STATUS "IRRLICHT_INCLUDE_DIR = ${IRRLICHT_INCLUDE_DIR}")
+# Find library directory
 
 FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
-   PATHS
-   $ENV{IRRDIR}/lib
-   $ENV{IRRDIR}/lib/Linux
-   $ENV{IRRDIR}/lib/MacOSX
-   $ENV{IRRDIR}/lib/Win32-gcc
-   $ENV{IRRDIR}/lib/Win32-visualstudio
-   $ENV{IRRDIR}/lib/Win64-visualstudio
-   /usr/local/lib
-   /usr/lib
+	PATHS
+	/usr/local/lib
+	/usr/lib
+	#${IRRLICHT_PLATFORM_DIR}
+	"${IRRLICHT_SOURCE_DIR}/lib/Win32-visualstudio"
+	"${IRRLICHT_SOURCE_DIR}/lib/Win32-gcc"
 )
 
+MESSAGE(STATUS "IRRLICHT_INCLUDE_DIR = ${IRRLICHT_INCLUDE_DIR}")
 MESSAGE(STATUS "IRRLICHT_LIBRARY = ${IRRLICHT_LIBRARY}")
 
+# On windows, find the dll for installation
+if(WIN32)
+	if(MSVC)
+		FIND_FILE(IRRLICHT_DLL NAMES Irrlicht.dll
+			PATHS
+			"${IRRLICHT_SOURCE_DIR}/bin/Win32-VisualStudio"
+			DOC "Path of the Irrlicht dll (for installation)"
+		)
+	else()
+		FIND_FILE(IRRLICHT_DLL NAMES Irrlicht.dll
+			PATHS
+			"${IRRLICHT_SOURCE_DIR}/bin/Win32-gcc"
+			DOC "Path of the Irrlicht dll (for installation)"
+		)
+	endif()
+	MESSAGE(STATUS "IRRLICHT_DLL = ${IRRLICHT_DLL}")
+endif(WIN32)
+
 # handle the QUIETLY and REQUIRED arguments and set IRRLICHT_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -34,5 +60,5 @@ ELSE(IRRLICHT_FOUND)
   SET(IRRLICHT_LIBRARIES)
 ENDIF(IRRLICHT_FOUND)
 
-MARK_AS_ADVANCED(IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR) 
+MARK_AS_ADVANCED(IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR IRRLICHT_DLL) 
 
diff --git a/cmake/Modules/misc.cmake b/cmake/Modules/misc.cmake
new file mode 100644
index 000000000..61a7d1407
--- /dev/null
+++ b/cmake/Modules/misc.cmake
@@ -0,0 +1,16 @@
+MACRO (GETDATETIME RESULT)
+    IF (WIN32)
+		EXECUTE_PROCESS(COMMAND "cmd" /C echo %date% %time% OUTPUT_VARIABLE ${RESULT})
+		string(REGEX REPLACE "\n" "" ${RESULT} "${${RESULT}}")
+    ELSEIF(UNIX)
+        EXECUTE_PROCESS(COMMAND "date" "+%Y-%m-%d_%H:%M:%S" OUTPUT_VARIABLE ${RESULT})
+		string(REGEX REPLACE "\n" "" ${RESULT} "${${RESULT}}")
+    ELSE (WIN32)
+        MESSAGE(SEND_ERROR "date not implemented")
+        SET(${RESULT} "Unknown")
+    ENDIF (WIN32)
+
+	string(REGEX REPLACE " " "_" ${RESULT} "${${RESULT}}")
+
+ENDMACRO (GETDATETIME)
+