[simspark-svn] SF.net SVN: simspark:[92] trunk

[<mar...@us...>]

Revision: 92
          http://simspark.svn.sourceforge.net/simspark/?rev=92&view=rev
Author:   marianbuchta
Date:     2009-08-25 12:31:23 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
rsgedit:
-remove forget line from previous revision

spark:
-fixed CMake configuration error on Windows when wxWidgets is available

Modified Paths:
--------------
    trunk/rsgedit/CMakeLists.txt
    trunk/rsgedit/ChangeLog
    trunk/spark/ChangeLog
    trunk/spark/plugin/inputwx/CMakeLists.txt
    trunk/spark/plugin/openglsyswx/CMakeLists.txt

Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt	2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/rsgedit/CMakeLists.txt	2009-08-25 12:31:23 UTC (rev 92)
@@ -79,14 +79,6 @@
 
        install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
              FILES_MATCHING PATTERN "*.dll")
-
-       string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
-       if (EXISTS ${DevIL_DLL})
-              install(PROGRAMS ${DevIL_DLL} DESTINATION ${BINDIR})
-       endif (EXISTS ${DevIL_DLL})
-
-       install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/" DESTINATION ${BINDIR}
-             FILES_MATCHING PATTERN "*.dll")
 endif (WIN32)
 
 ########### uninstall support ############

Modified: trunk/rsgedit/ChangeLog
===================================================================
--- trunk/rsgedit/ChangeLog	2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/rsgedit/ChangeLog	2009-08-25 12:31:23 UTC (rev 92)
@@ -1,3 +1,8 @@
+2009-08-25  Marian Buchta  <mar...@gm...>
+
+	* CMakeLists.txt:
+	- forgot remove lines (from previous revision) to find Ruby,Freetype and DevIL libraries and add dlls into package via NSIS installer (Windows).
+
 2009-08-24  Marian Buchta  <mar...@gm...>
 
 	* src/CMakeLists.txt:

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/spark/ChangeLog	2009-08-25 12:31:23 UTC (rev 92)
@@ -1,3 +1,9 @@
+2009-08-25  Marian Buchta  <mar...@gm...>
+
+	* plugin/openglsyswx/CMakeLists.txt:
+	* plugin/inputwx/CMakeLists.txt:
+	- fixed CMake configuration error on Windows when wxWidgets is available
+
 2009-08-24  Marian Buchta  <mar...@gm...>
 
 	* cmake/FindRuby.cmake:

Modified: trunk/spark/plugin/inputwx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputwx/CMakeLists.txt	2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/spark/plugin/inputwx/CMakeLists.txt	2009-08-25 12:31:23 UTC (rev 92)
@@ -17,7 +17,7 @@
 
   target_link_libraries(inputwx ${wxWidgets_LIBRARIES} ${spark_libs})
 
-  set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
+  set_target_properties(inputwx PROPERTIES COMPILE_FLAGS "${wxWidgets_CXX_FLAGS}")
   if (NOT APPLE)
      set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
   endif (NOT APPLE)

Modified: trunk/spark/plugin/openglsyswx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyswx/CMakeLists.txt	2009-08-24 00:59:01 UTC (rev 91)
+++ trunk/spark/plugin/openglsyswx/CMakeLists.txt	2009-08-25 12:31:23 UTC (rev 92)
@@ -19,7 +19,7 @@
      set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
   endif (NOT APPLE)
 
-  set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
+  set_target_properties(inputwx PROPERTIES COMPILE_FLAGS "${wxWidgets_CXX_FLAGS}")
   
   install(TARGETS openglsyswx DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
 endif (wxWidgets_FOUND)


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