[Plplot-cvs] SF.net SVN: plplot:[9350] trunk

[<sm...@us...>]

Revision: 9350
          http://plplot.svn.sourceforge.net/plplot/?rev=9350&view=rev
Author:   smekal
Date:     2009-01-20 07:45:17 +0000 (Tue, 20 Jan 2009)

Log Message:
-----------
The Borland compiler (5.5) should be able to find the gdi32 and comdlg32 import libraries now. The changes are actually not tested with the Borland compiler.

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/cmake/modules/wingcc.cmake

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2009-01-20 04:16:57 UTC (rev 9349)
+++ trunk/CMakeLists.txt	2009-01-20 07:45:17 UTC (rev 9350)
@@ -46,7 +46,7 @@
 # Location where PLplot cmake build system first looks for cmake modules.
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
 
-# We need the path to the MinGW compiler in order to find
+# We need the path to the MinGW/Borland compiler in order to find
 # the import libraries for system libraries.
 IF(MINGW)
 	get_filename_component(MINGWBINPATH ${CMAKE_C_COMPILER} PATH)
@@ -54,6 +54,12 @@
 			CACHE FILEPATH
 			DOCSTRING "Path to MinGW import libraries")
 ENDIF(MINGW)
+IF(BORLAND)
+	get_filename_component(BORLANDBINPATH ${CMAKE_C_COMPILER} PATH)
+	set(BORLANDLIBPATH ${BORLANDBINPATH}/../Lib/PSDK
+			CACHE FILEPATH
+			DOCSTRING "Path to Borland import libraries")
+ENDIF(BORLAND)
 
 # Version data that need modification for each release.
 include(plplot_version)

Modified: trunk/cmake/modules/wingcc.cmake
===================================================================
--- trunk/cmake/modules/wingcc.cmake	2009-01-20 04:16:57 UTC (rev 9349)
+++ trunk/cmake/modules/wingcc.cmake	2009-01-20 07:45:17 UTC (rev 9350)
@@ -29,9 +29,9 @@
 
 if(PLD_wingcc)
   message(STATUS "Looking for gdi32 header and library")
-  find_library(GDI32_LIBRARY gdi32 HINTS ${MINGWLIBPATH})
+  find_library(GDI32_LIBRARY gdi32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH})
   if(GDI32_LIBRARY)
-    find_library(COMDLG32_LIBRARY comdlg32 HINTS ${MINGWLIBPATH})
+    find_library(COMDLG32_LIBRARY comdlg32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH})
   endif(GDI32_LIBRARY)
   if(GDI32_LIBRARY AND COMDLG32_LIBRARY)
     message(STATUS "Looking for gdi32 header and library - found")


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