[Tora-cvs] SF.net SVN: tora:[2982] trunk/tora

[<su...@us...>]

Revision: 2982
          http://tora.svn.sourceforge.net/tora/?rev=2982&view=rev
Author:   subik
Date:     2008-09-08 13:55:43 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
use an icon for the executable under windows

Modified Paths:
--------------
    trunk/tora/CMakeLists.txt
    trunk/tora/src/CMakeLists.txt

Added Paths:
-----------
    trunk/tora/src/icons/tora.ico
    trunk/tora/src/tora.rc

Modified: trunk/tora/CMakeLists.txt
===================================================================
--- trunk/tora/CMakeLists.txt	2008-09-08 12:48:12 UTC (rev 2981)
+++ trunk/tora/CMakeLists.txt	2008-09-08 13:55:43 UTC (rev 2982)
@@ -58,7 +58,11 @@
 ADD_DEFINITIONS("-DDEFAULT_PLUGIN_DIR=\\\"${TORA_PLUGIN_DIR}\\\"")
 
 if (NOT TORA_DOC_DIR)
-    SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/")
+	IF (UNIX)
+	    SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/")
+	ELSE (UNIX)
+		SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/doc/")
+	ENDIF (UNIX)
 endif (NOT TORA_DOC_DIR)
 
 #if (NOT TORA_HELP_DIR)

Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt	2008-09-08 12:48:12 UTC (rev 2981)
+++ trunk/tora/src/CMakeLists.txt	2008-09-08 13:55:43 UTC (rev 2982)
@@ -360,7 +360,12 @@
     migratetool/squirrelsql.cpp
     migratetool/tora3.cpp
 )
+# compiled in icons for windows
+IF (WIN32 AND MSVC)
+    SET (TORA_SOURCES ${TORA_SOURCES} tora.rc)
+ENDIF (WIN32 AND MSVC)
 
+
 QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS})
 QT4_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} )
 QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES})


Property changes on: trunk/tora/src/icons/tora.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/tora/src/tora.rc
===================================================================
--- trunk/tora/src/tora.rc	                        (rev 0)
+++ trunk/tora/src/tora.rc	2008-09-08 13:55:43 UTC (rev 2982)
@@ -0,0 +1,2 @@
+IDI_ICON1               ICON            DISCARDABLE     "icons/tora.ico"
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.