[simspark-svn] SF.net SVN: simspark:[197] trunk/spark/plugin

[<he...@us...>]

Revision: 197
          http://simspark.svn.sourceforge.net/simspark/?rev=197&view=rev
Author:   hedayat
Date:     2010-05-12 20:39:17 +0000 (Wed, 12 May 2010)

Log Message:
-----------
CMake 2.8 compatibility fix

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

Modified: trunk/spark/plugin/inputwx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputwx/CMakeLists.txt	2010-05-09 17:45:33 UTC (rev 196)
+++ trunk/spark/plugin/inputwx/CMakeLists.txt	2010-05-12 20:39:17 UTC (rev 197)
@@ -12,7 +12,13 @@
   )
 
   include_directories(${wxWidgets_INCLUDE_DIRS})
-  add_definitions(${wxWidgets_DEFINITIONS})
+  if (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+    add_definitions(${wxWidgets_DEFINITIONS})
+  else (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+    set_property(DIRECTORY APPEND
+      PROPERTY COMPILE_DEFINITIONS ${wxWidgets_DEFINITIONS})
+  endif (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+  
   add_library(inputwx MODULE ${inputwx_LIB_SRCS})
 
   target_link_libraries(inputwx ${wxWidgets_LIBRARIES} ${spark_libs})

Modified: trunk/spark/plugin/openglsyswx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyswx/CMakeLists.txt	2010-05-09 17:45:33 UTC (rev 196)
+++ trunk/spark/plugin/openglsyswx/CMakeLists.txt	2010-05-12 20:39:17 UTC (rev 197)
@@ -10,7 +10,12 @@
   )
   
   include_directories(${wxWidgets_INCLUDE_DIRS})
-  add_definitions(${wxWidgets_DEFINITIONS})
+  if (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+    add_definitions(${wxWidgets_DEFINITIONS})
+  else (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+    set_property(DIRECTORY APPEND
+      PROPERTY COMPILE_DEFINITIONS ${wxWidgets_DEFINITIONS})
+  endif (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
   add_library(openglsyswx MODULE ${openglsyswx_LIB_SRCS})
 
   target_link_libraries(openglsyswx ${wxWidgets_LIBRARIES} ${spark_libs})


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