PLplot

Revision: 9019
          http://plplot.svn.sourceforge.net/plplot/?rev=9019&view=rev
Author:   smekal
Date:     2008-11-26 08:32:25 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
Fixed compile problems which occured if the wxWidgets driver was turned on, but the cxx bindings were turned off, since there was no check for stdint.h.

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2008-11-24 21:48:27 UTC (rev 9018)
+++ trunk/cmake/modules/wxwidgets.cmake	2008-11-26 08:32:25 UTC (rev 9019)
@@ -40,7 +40,19 @@
   endif(NOT wxWidgets_FOUND)  
 endif(PLD_wxwidgets)
 
+# Need to add check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H)
 if(PLD_wxwidgets)
+  include(TestForStdintCXX)
+  if(NOT CMAKE_CXX_STDINT_H)
+    message(STATUS
+    "WARNING: CXX compiler doesn't support using stdint.h so "
+    "setting PLD_wxwidgets to OFF."
+    )
+    set(PLD_wxwidgets OFF CACHE BOOL "Enable wxwidgets device" FORCE)
+  endif(NOT CMAKE_CXX_STDINT_H)
+endif(PLD_wxwidgets)
+
+if(PLD_wxwidgets)
   #message("wxWidgets_INCLUDE_DIRS = ${wxWidgets_INCLUDE_DIRS}")
   #message("wxWidgets_DEFINITIONS = ${wxWidgets_DEFINITIONS}")
   string(REGEX REPLACE ";" " -I" 


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

Revision: 9025
          http://plplot.svn.sourceforge.net/plplot/?rev=9025&view=rev
Author:   smekal
Date:     2008-11-28 19:22:15 +0000 (Fri, 28 Nov 2008)

Log Message:
-----------
The wxWidgets driver is also built if the stdint.h check fails - which is the case for Visual C++. The alternative definition in plplot.h is okay for this case.

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2008-11-28 10:40:46 UTC (rev 9024)
+++ trunk/cmake/modules/wxwidgets.cmake	2008-11-28 19:22:15 UTC (rev 9025)
@@ -37,24 +37,13 @@
     "setting PLD_wxwidgets to OFF."
     )
     set(PLD_wxwidgets OFF CACHE BOOL "Enable wxwidgets device" FORCE)
+  else(NOT wxWidgets_FOUND)  
+		# Check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H)
+		include(TestForStdintCXX)
   endif(NOT wxWidgets_FOUND)  
 endif(PLD_wxwidgets)
 
-# Need to add check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H)
 if(PLD_wxwidgets)
-  include(TestForStdintCXX)
-  if(NOT CMAKE_CXX_STDINT_H)
-    message(STATUS
-    "WARNING: CXX compiler doesn't support using stdint.h so "
-    "setting PLD_wxwidgets to OFF."
-    )
-    set(PLD_wxwidgets OFF CACHE BOOL "Enable wxwidgets device" FORCE)
-  endif(NOT CMAKE_CXX_STDINT_H)
-endif(PLD_wxwidgets)
-
-if(PLD_wxwidgets)
-  #message("wxWidgets_INCLUDE_DIRS = ${wxWidgets_INCLUDE_DIRS}")
-  #message("wxWidgets_DEFINITIONS = ${wxWidgets_DEFINITIONS}")
   string(REGEX REPLACE ";" " -I" 
   wxwidgets_COMPILE_FLAGS
   "-I${wxWidgets_INCLUDE_DIRS}"


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

Revision: 9101
          http://plplot.svn.sourceforge.net/plplot/?rev=9101&view=rev
Author:   airwin
Date:     2008-12-14 07:58:15 +0000 (Sun, 14 Dec 2008)

Log Message:
-----------
ENABLE_wxwidgets=OFF by default since wxPLplotDemo segfaults on Linux.  This
(hopefully temporary) build-system change does not affect -dev wxwidgets
which appears to work on Linux.

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2008-12-14 06:08:41 UTC (rev 9100)
+++ trunk/cmake/modules/wxwidgets.cmake	2008-12-14 07:58:15 UTC (rev 9101)
@@ -89,7 +89,7 @@
 if(DEFAULT_NO_BINDINGS)
   option(ENABLE_wxwidgets "Enable wxwidgets bindings" OFF)
 else(DEFAULT_NO_BINDINGS)
-  option(ENABLE_wxwidgets "Enable wxwidgets bindings" ON)
+  option(ENABLE_wxwidgets "Enable wxwidgets bindings" OFF)
 endif(DEFAULT_NO_BINDINGS)
 
 if(ENABLE_wxwidgets AND NOT PLD_wxwidgets)


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

Revision: 9558
          http://plplot.svn.sourceforge.net/plplot/?rev=9558&view=rev
Author:   smekal
Date:     2009-02-19 22:45:45 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Applied a patch by Vadim Zeitlin: the wxWidgets driver and bindings need only the base and core component of wxWidgets.

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2009-02-19 22:32:07 UTC (rev 9557)
+++ trunk/cmake/modules/wxwidgets.cmake	2009-02-19 22:45:45 UTC (rev 9558)
@@ -30,7 +30,7 @@
 
 # Find wxWidgets needed for driver and bindings
 if(PLD_wxwidgets OR PLD_wxpng)
-  find_package(wxWidgets QUIET)
+  find_package(wxWidgets COMPONENTS base core QUIET)
   if(NOT wxWidgets_FOUND)
     message(STATUS
       "WARNING: wxWidgets not found so "


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

Revision: 9886
          http://plplot.svn.sourceforge.net/plplot/?rev=9886&view=rev
Author:   airwin
Date:     2009-05-03 00:23:09 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Give more information about found version of wxwidgets.

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2009-05-02 22:09:40 UTC (rev 9885)
+++ trunk/cmake/modules/wxwidgets.cmake	2009-05-03 00:23:09 UTC (rev 9886)
@@ -57,6 +57,9 @@
     )
   # Convert wxWidgets_LIBRARIES to full pathname form.
   cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}")
+  message(STATUS "wxWidgets found")
+  message(STATUS "wxwidgets_COMPILE_FLAGS = ${wxwidgets_COMPILE_FLAGS}")
+  message(STATUS "wxwidgets_LINK_FLAGS = ${wxwidgets_LINK_FLAGS}")
   include(agg)
   if(HAVE_AGG)
     set(


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

Revision: 10199
          http://plplot.svn.sourceforge.net/plplot/?rev=10199&view=rev
Author:   airwin
Date:     2009-08-03 02:02:37 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
Replace ENABLE_cxx logic with CMAKE_CXX_COMPILER_WORKS logic to keep meaning
of ENABLE_cxx "pure", i.e., enabling the C++ bindings and everything that
depends upon them, but not device drivers that happen to be written in C++.

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2009-08-02 05:44:48 UTC (rev 10198)
+++ trunk/cmake/modules/wxwidgets.cmake	2009-08-03 02:02:37 UTC (rev 10199)
@@ -107,6 +107,13 @@
   option(ENABLE_wxwidgets "Enable wxwidgets bindings" ON)
 endif(DEFAULT_NO_BINDINGS)
 
+if(ENABLE_wxwidgets AND NOT CMAKE_CXX_COMPILER_WORKS)
+  message(STATUS "WARNING: no working C++ compiler so "
+    "setting ENABLE_wxwidgets to OFF."
+    )
+  set(ENABLE_wxwidgets OFF CACHE BOOL "Enable wxwidgets bindings" FORCE)
+endif(ENABLE_wxwidgets AND NOT CMAKE_CXX_COMPILER_WORKS)
+
 if(ENABLE_wxwidgets AND NOT PLD_wxwidgets)
   message(STATUS
     "WARNING: PLD_wxwidgets is OFF so "
@@ -115,13 +122,6 @@
   set(ENABLE_wxwidgets OFF CACHE BOOL "Enable wxwidgets bindings" FORCE)
 endif(ENABLE_wxwidgets AND NOT PLD_wxwidgets)
 
-if(ENABLE_wxwidgets AND NOT ENABLE_cxx)
-  message(STATUS
-    "WARNING: ENABLE_cxx is OFF so "
-    "setting ENABLE_wxwidgets to OFF."
-    )
-  set(ENABLE_wxwidgets OFF CACHE BOOL "Enable wxwidgets bindings" FORCE)
-endif(ENABLE_wxwidgets AND NOT ENABLE_cxx)
 if(ENABLE_wxwidgets)
   set(wxwidgets_true "")
 else(ENABLE_wxwidgets)


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

Revision: 10611
          http://plplot.svn.sourceforge.net/plplot/?rev=10611&view=rev
Author:   airwin
Date:     2009-11-18 23:57:43 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
The combination of WITH_FREETYPE=OFF and HAVE_AGG=ON generates build errors
for wxwidgets_agg.cpp so always avoid that combination of flags by
determining HAVE_AGG only when WITH_FREETYPE=ON.  (Note if HAVE_AGG is not
determined, then it is logically false or the equivalent of OFF.)

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2009-11-17 13:57:18 UTC (rev 10610)
+++ trunk/cmake/modules/wxwidgets.cmake	2009-11-18 23:57:43 UTC (rev 10611)
@@ -81,19 +81,19 @@
   message(STATUS "wxWidgets found")
   message(STATUS "wxwidgets_COMPILE_FLAGS = ${wxwidgets_COMPILE_FLAGS}")
   message(STATUS "wxwidgets_LINK_FLAGS = ${wxwidgets_LINK_FLAGS}")
-  include(agg)
-  if(HAVE_AGG)
-    set(
-      wxwidgets_COMPILE_FLAGS
-      "${wxwidgets_COMPILE_FLAGS} -I${AGG_INCLUDE_DIRS}"
-      )
-    set(
-      wxwidgets_LINK_FLAGS
-      ${wxwidgets_LINK_FLAGS}
-      ${AGG_LIBRARIES}
-      )
-  endif(HAVE_AGG)
   if(WITH_FREETYPE)
+    include(agg)
+    if(HAVE_AGG)
+      set(
+	wxwidgets_COMPILE_FLAGS
+	"${wxwidgets_COMPILE_FLAGS} -I${AGG_INCLUDE_DIRS}"
+	)
+      set(
+	wxwidgets_LINK_FLAGS
+	${wxwidgets_LINK_FLAGS}
+	${AGG_LIBRARIES}
+	)
+    endif(HAVE_AGG)
     set(
       wxwidgets_COMPILE_FLAGS
       "${wxwidgets_COMPILE_FLAGS} -I${FREETYPE_INCLUDE_DIR}"


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

Revision: 11093
          http://plplot.svn.sourceforge.net/plplot/?rev=11093&view=rev
Author:   airwin
Date:     2010-07-21 17:51:07 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
Emit WARNING when the AGG component of wxwidgets has been dropped.

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2010-07-21 16:49:22 UTC (rev 11092)
+++ trunk/cmake/modules/wxwidgets.cmake	2010-07-21 17:51:07 UTC (rev 11093)
@@ -93,6 +93,8 @@
 	${wxwidgets_LINK_FLAGS}
 	${AGG_LIBRARIES}
 	)
+    else(HAVE_AGG)
+      message(STATUS "WARNING: wxwidgets driver and bindings components depending on AGG library have been dropped.")
     endif(HAVE_AGG)
     set(
       wxwidgets_COMPILE_FLAGS


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

Revision: 12065
          http://plplot.svn.sourceforge.net/plplot/?rev=12065&view=rev
Author:   airwin
Date:     2011-11-28 22:37:50 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Be more careful of the case (e.g., FORCE_EXTERNAL_STATIC ON) when
wxwidgets libraries are not found.

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2011-11-28 20:09:14 UTC (rev 12064)
+++ trunk/cmake/modules/wxwidgets.cmake	2011-11-28 22:37:50 UTC (rev 12065)
@@ -41,18 +41,23 @@
 endif(PLD_wxwidgets OR PLD_wxpng)
 
 if(PLD_wxwidgets OR PLD_wxpng)
+  if(FORCE_EXTERNAL_STATIC)
+    set(wxWidgets_USE_STATIC ON)
+  endif(FORCE_EXTERNAL_STATIC)
   find_package(wxWidgets COMPONENTS base core QUIET)
-  if(NOT wxWidgets_FOUND)
+  # Convert wxWidgets_LIBRARIES to full pathname form.
+  cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}")
+  if(NOT wxWidgets_FOUND OR NOT wxwidgets_LINK_FLAGS)
     message(STATUS
-      "WARNING: wxWidgets not found so "
+      "WARNING: wxWidgets or its libraries not found so "
       "setting all wxwidgets devices to OFF."
       )
     set(PLD_wxwidgets OFF CACHE BOOL "Enable wxwidgets device" FORCE)
     set(PLD_wxpng OFF CACHE BOOL "Enable wxwidgets png device" FORCE)
-  else(NOT wxWidgets_FOUND)  
+  else(NOT wxWidgets_FOUND OR NOT wxwidgets_LINK_FLAGS)  
     # Check if stdint.h can be used from c++ (PL_HAVE_CXX_STDINT_H)
     include(TestForStdintCXX)
-  endif(NOT wxWidgets_FOUND)  
+  endif(NOT wxWidgets_FOUND OR NOT wxwidgets_LINK_FLAGS)  
 endif(PLD_wxwidgets OR PLD_wxpng)
 
 if(PLD_wxwidgets OR PLD_wxpng)
@@ -64,20 +69,18 @@
     wxWidgets_DEFINITIONS_wD
     "-D${wxWidgets_DEFINITIONS}"
     )
- 	set(wxWidgets_DEFINITIONS_DEBUG_wD "") 
+  set(wxWidgets_DEFINITIONS_DEBUG_wD "") 
   if(wxWidgets_DEFINITIONS_DEBUG)
-	  string(REGEX REPLACE ";" " -D" 
-	    wxWidgets_DEFINITIONS_DEBUG_wD
-	    "-D${wxWidgets_DEFINITIONS_DEBUG}"
-	    )
+    string(REGEX REPLACE ";" " -D" 
+      wxWidgets_DEFINITIONS_DEBUG_wD
+      "-D${wxWidgets_DEFINITIONS_DEBUG}"
+      )
   endif(wxWidgets_DEFINITIONS_DEBUG)
   string(REGEX REPLACE ";" " " 
     wxwidgets_COMPILE_FLAGS
     ${wxwidgets_COMPILE_FLAGS}
     " ${wxWidgets_DEFINITIONS_wD} ${wxWidgets_DEFINITIONS_DEBUG_wD}"
     )
-  # Convert wxWidgets_LIBRARIES to full pathname form.
-  cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}")
   message(STATUS "wxWidgets found")
   message(STATUS "wxwidgets_COMPILE_FLAGS = ${wxwidgets_COMPILE_FLAGS}")
   message(STATUS "wxwidgets_LINK_FLAGS = ${wxwidgets_LINK_FLAGS}")

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

Revision: 12193
          http://plplot.svn.sourceforge.net/plplot/?rev=12193&view=rev
Author:   airwin
Date:     2012-05-01 17:27:14 +0000 (Tue, 01 May 2012)
Log Message:
-----------
wxwidgets.so contains symbols that must be resolved by the agg
libraries and freetype library.  So revert back to revision 12065
because Orion's overlinking fixup patch was too aggressive at removing
linking information in this case.

Revision Links:
--------------
    http://plplot.svn.sourceforge.net/plplot/?rev=12065&view=rev

Modified Paths:
--------------
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2012-04-26 23:34:20 UTC (rev 12192)
+++ trunk/cmake/modules/wxwidgets.cmake	2012-05-01 17:27:14 UTC (rev 12193)
@@ -91,6 +91,11 @@
 	wxwidgets_COMPILE_FLAGS
 	"${wxwidgets_COMPILE_FLAGS} -I${AGG_INCLUDE_DIRS}"
 	)
+      set(
+	wxwidgets_LINK_FLAGS
+	${wxwidgets_LINK_FLAGS}
+	${AGG_LIBRARIES}
+	)
     else(HAVE_AGG)
       message(STATUS "WARNING: wxwidgets driver and bindings components depending on AGG library have been dropped.")
     endif(HAVE_AGG)
@@ -98,6 +103,11 @@
       wxwidgets_COMPILE_FLAGS
       "${wxwidgets_COMPILE_FLAGS} -I${FREETYPE_INCLUDE_DIR}"
       )
+    set(
+      wxwidgets_LINK_FLAGS
+      ${wxwidgets_LINK_FLAGS}
+      ${FREETYPE_LIBRARIES}
+      )
   endif(WITH_FREETYPE)
   set(DRIVERS_LINK_FLAGS
     ${DRIVERS_LINK_FLAGS} 

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