[Scstudio-commits] SF.net SVN: scstudio:[1297] trunk

[<got...@us...>]

Revision: 1297
          http://scstudio.svn.sourceforge.net/scstudio/?rev=1297&view=rev
Author:   gotthardp
Date:     2012-01-21 20:55:19 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Fixes for CMake 2.8 and ANTLR 3.4

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/FindANTLR.cmake

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-01-21 20:50:45 UTC (rev 1296)
+++ trunk/CMakeLists.txt	2012-01-21 20:55:19 UTC (rev 1297)
@@ -52,7 +52,7 @@
 FIND_PACKAGE(Boost COMPONENTS date_time thread REQUIRED)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
 
-FIND_PACKAGE(Java)
+FIND_PACKAGE(Java COMPONENTS Runtime)
 # keep antlr an optional prerequisite
 FIND_PACKAGE(ANTLR)
 

Modified: trunk/FindANTLR.cmake
===================================================================
--- trunk/FindANTLR.cmake	2012-01-21 20:50:45 UTC (rev 1296)
+++ trunk/FindANTLR.cmake	2012-01-21 20:55:19 UTC (rev 1297)
@@ -8,6 +8,7 @@
     antlr-3.1.1.jar
     antlr-3.1.2.jar
     antlr-3.1.3.jar
+    antlr-3.4-complete.jar
   PATHS
     ${ANTLR_ROOT}/lib
   DOC "The ANTLR class file")

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