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

[<tm...@us...>]

Revision: 1454
          http://scstudio.svn.sourceforge.net/scstudio/?rev=1454&view=rev
Author:   tmarton
Date:     2012-09-04 09:31:24 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
FindANTLR for linux searching in defaults directories too.

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

Added Paths:
-----------
    trunk/FindANTLR_default.cmake

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-09-04 08:31:14 UTC (rev 1453)
+++ trunk/CMakeLists.txt	2012-09-04 09:31:24 UTC (rev 1454)
@@ -68,17 +68,20 @@
 FIND_PACKAGE(Boost COMPONENTS date_time thread serialization REQUIRED)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
 
+FIND_PACKAGE(Java COMPONENTS Runtime)
+# keep antlr an optional prerequisite
+
 # antlr setup
 IF(WIN32)
   IF(NOT ANTLR_ROOT)
     #set implicit ANTLR_ROOT 
     SET(ANTLR_ROOT "${CMAKE_SOURCE_DIR}/third-party-sw/antlr/" CACHE PATH "The Antlr directory root.")
   ENDIF(NOT ANTLR_ROOT)
+  FIND_PACKAGE(ANTLR)
+ELSE(WIN32)
+  FIND_PACKAGE(ANTLR_default)
 ENDIF(WIN32)
 
-FIND_PACKAGE(Java COMPONENTS Runtime)
-# keep antlr an optional prerequisite
-FIND_PACKAGE(ANTLR)
 
 INCLUDE_DIRECTORIES(src)
 INCLUDE_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/include)

Added: trunk/FindANTLR_default.cmake
===================================================================
--- trunk/FindANTLR_default.cmake	                        (rev 0)
+++ trunk/FindANTLR_default.cmake	2012-09-04 09:31:24 UTC (rev 1454)
@@ -0,0 +1,51 @@
+# set the default ANTLR_ROOT value
+ 
+IF(NOT ANTLR_ROOT)
+  SET(ANTLR_ROOT $ENV{ANTLR_ROOT} CACHE PATH "The ANTLR directory root.")
+ENDIF(NOT ANTLR_ROOT)
+
+FIND_FILE(ANTLR_CLASSPATH
+  NAMES
+    antlr-3.4-complete.jar
+    antlr-3.1.3.jar
+    antlr-3.1.2.jar
+    antlr-3.1.1.jar
+  PATHS
+    ${ANTLR_ROOT}/lib
+  DOC "The ANTLR class file")
+
+FIND_LIBRARY(ANTLR_LIBRARY
+  NAMES antlr3c
+  PATHS
+    ${ANTLR_ROOT}/runtime/C
+    ${ANTLR_ROOT}/runtime/C/Release
+    ${ANTLR_ROOT}/runtime/C/lib${ARCHITECTURE_PTR_SIZE}
+  DOC "The ANTLR library")
+
+FIND_LIBRARY(ANTLR_LIBRARY_DEBUG
+  NAMES antlr3cd
+  PATHS
+    ${ANTLR_ROOT}/runtime/C
+    ${ANTLR_ROOT}/runtime/C/Debug
+    ${ANTLR_ROOT}/runtime/C/lib${ARCHITECTURE_PTR_SIZE}
+  DOC "The ANTLR debug library")
+
+IF(NOT ANTLR_LIBRARY_DEBUG)
+  SET(ANTLR_LIBRARY_DEBUG ${ANTLR_LIBRARY})
+  SET(ANTLR_LIBRARIES ${ANTLR_LIBRARY})
+ELSE()
+  SET(ANTLR_LIBRARIES 
+    optimized ${ANTLR_LIBRARY}
+    debug ${ANTLR_LIBRARY_DEBUG}
+  )
+ENDIF()
+
+FIND_PATH(ANTLR_INCLUDE_DIR
+  NAMES antlr3.h
+  PATHS
+    ${ANTLR_ROOT}/runtime/C/include
+  DOC "The ANTLR include files")
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ANTLR DEFAULT_MSG
+  ANTLR_CLASSPATH ANTLR_LIBRARY ANTLR_INCLUDE_DIR)

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