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

[<xr...@us...>]

Revision: 1408
          http://scstudio.svn.sourceforge.net/scstudio/?rev=1408&view=rev
Author:   xrehak
Date:     2012-06-20 22:28:04 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Cmake for antlr and lpsolved improved. Detection of 32/64-bit.

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

Added Paths:
-----------
    trunk/third-party-sw/antlr/runtime/C/lib32/
    trunk/third-party-sw/antlr/runtime/C/lib64/
    trunk/third-party-sw/antlr/runtime/C/lib64/antlr3c.lib
    trunk/third-party-sw/antlr/runtime/C/lib64/antlr3cd.lib

Removed Paths:
-------------
    trunk/third-party-sw/antlr/runtime/C/32bit/
    trunk/third-party-sw/antlr/runtime/C/antlr3c.lib
    trunk/third-party-sw/antlr/runtime/C/antlr3cd.lib

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-06-20 19:05:09 UTC (rev 1407)
+++ trunk/CMakeLists.txt	2012-06-20 22:28:04 UTC (rev 1408)
@@ -29,10 +29,20 @@
    ADD_DEFINITIONS(-DHOST_IS_BIG_ENDIAN)
 ENDIF(BIG_ENDIAN)
 
+# 32/64 platform test
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  SET(ARCHITECTURE_PTR_SIZE "64")
+  MESSAGE(STATUS "Check architecture - 64-bit")
+ELSE()
+  SET(ARCHITECTURE_PTR_SIZE "32")
+  MESSAGE(STATUS "Check architecture - 32-bit")
+ENDIF()
+
 # Enforce strict ANSI C/C++ compliancy checking
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -ansi -Wall -Wno-long-long")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
 # Disable microsoft security warnings
 IF(MSVC)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS")
@@ -59,7 +69,7 @@
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
 
 # antlr setup
-IF (WIN32)
+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.")

Modified: trunk/FindANTLR.cmake
===================================================================
--- trunk/FindANTLR.cmake	2012-06-20 19:05:09 UTC (rev 1407)
+++ trunk/FindANTLR.cmake	2012-06-20 22:28:04 UTC (rev 1408)
@@ -1,4 +1,5 @@
 # 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)
@@ -11,6 +12,7 @@
     antlr-3.1.1.jar
   PATHS
     ${ANTLR_ROOT}/lib
+#  NO_DEFAULT_PATH
   DOC "The ANTLR class file")
 
 FIND_LIBRARY(ANTLR_LIBRARY
@@ -18,6 +20,8 @@
   PATHS
     ${ANTLR_ROOT}/runtime/C
     ${ANTLR_ROOT}/runtime/C/Release
+    ${ANTLR_ROOT}/runtime/C/lib${ARCHITECTURE_PTR_SIZE}
+#  NO_DEFAULT_PATH
   DOC "The ANTLR library")
 
 FIND_LIBRARY(ANTLR_LIBRARY_DEBUG
@@ -25,6 +29,8 @@
   PATHS
     ${ANTLR_ROOT}/runtime/C
     ${ANTLR_ROOT}/runtime/C/Debug
+    ${ANTLR_ROOT}/runtime/C/lib${ARCHITECTURE_PTR_SIZE}
+#  NO_DEFAULT_PATH
   DOC "The ANTLR debug library")
 
 IF(NOT ANTLR_LIBRARY_DEBUG)
@@ -41,6 +47,7 @@
   NAMES antlr3.h
   PATHS
     ${ANTLR_ROOT}/runtime/C/include
+#  NO_DEFAULT_PATH
   DOC "The ANTLR include files")
 
 INCLUDE(FindPackageHandleStandardArgs)

Modified: trunk/FindLpSolve.cmake
===================================================================
--- trunk/FindLpSolve.cmake	2012-06-20 19:05:09 UTC (rev 1407)
+++ trunk/FindLpSolve.cmake	2012-06-20 22:28:04 UTC (rev 1408)
@@ -8,25 +8,14 @@
   ENDIF(ENV{LPSOLVE_ROOT})
 ENDIF(NOT LPSOLVE_ROOT)
 
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  FIND_LIBRARY(LPSOLVE_LIBRARY
-    NAMES lpsolve55
-    PATHS
-      ${LPSOLVE_ROOT}
-      ${LPSOLVE_ROOT}/lib
-      ${LPSOLVE_ROOT}/lib64
-    NO_DEFAULT_PATH
-    DOC "The lp_solve library")
-ELSE()
-  FIND_LIBRARY(LPSOLVE_LIBRARY
-    NAMES lpsolve55
-    PATHS
-      ${LPSOLVE_ROOT}
-      ${LPSOLVE_ROOT}/lib
-      ${LPSOLVE_ROOT}/lib32
-    NO_DEFAULT_PATH
-    DOC "The lp_solve library")
-ENDIF()
+FIND_LIBRARY(LPSOLVE_LIBRARY
+  NAMES lpsolve55
+  PATHS
+    ${LPSOLVE_ROOT}
+    ${LPSOLVE_ROOT}/lib
+    ${LPSOLVE_ROOT}/lib${ARCHITECTURE_PTR_SIZE}
+  NO_DEFAULT_PATH
+  DOC "The lp_solve library")
 
 FIND_PATH(LPSOLVE_INCLUDE_DIR
   NAMES lp_lib.h

Deleted: trunk/third-party-sw/antlr/runtime/C/antlr3c.lib
===================================================================
(Binary files differ)

Deleted: trunk/third-party-sw/antlr/runtime/C/antlr3cd.lib
===================================================================
(Binary files differ)

Copied: trunk/third-party-sw/antlr/runtime/C/lib64/antlr3c.lib (from rev 1407, trunk/third-party-sw/antlr/runtime/C/antlr3c.lib)
===================================================================
(Binary files differ)

Copied: trunk/third-party-sw/antlr/runtime/C/lib64/antlr3cd.lib (from rev 1407, trunk/third-party-sw/antlr/runtime/C/antlr3cd.lib)
===================================================================
(Binary files differ)

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