From: <ai...@us...> - 2007-04-13 17:07:07
|
Revision: 7673 http://plplot.svn.sourceforge.net/plplot/?rev=7673&view=rev Author: airwin Date: 2007-04-13 10:07:07 -0700 (Fri, 13 Apr 2007) Log Message: ----------- Tweak message spelling. Fix DEFAULT_NO_BINDINGS logic. Modified Paths: -------------- trunk/cmake/modules/wxwidgets.cmake Modified: trunk/cmake/modules/wxwidgets.cmake =================================================================== --- trunk/cmake/modules/wxwidgets.cmake 2007-04-13 16:05:18 UTC (rev 7672) +++ trunk/cmake/modules/wxwidgets.cmake 2007-04-13 17:07:07 UTC (rev 7673) @@ -69,24 +69,24 @@ ) endif(PLD_wxwidgets) -if(PLD_wxwidgets) - if(DEFAULT_NO_BINDINGS) - option(ENABLE_wxwidgets "Enable wxwidgets bindings" OFF) - else(DEFAULT_NO_BINDINGS) - option(ENABLE_wxwidgets "Enable wxwidgets bindings" ON) - endif(DEFAULT_NO_BINDINGS) -else(PLD_wxwidgets) +if(DEFAULT_NO_BINDINGS) + option(ENABLE_wxwidgets "Enable wxwidgets bindings" OFF) +else(DEFAULT_NO_BINDINGS) + option(ENABLE_wxwidgets "Enable wxwidgets bindings" ON) +endif(DEFAULT_NO_BINDINGS) + +if(ENABLE_wxwidgets AND NOT PLD_wxwidgets) message(STATUS "WARNING: PLD_wxwidgets is OFF so " - "Setting ENABLE_wxwidgets to OFF." + "setting ENABLE_wxwidgets to OFF." ) set(ENABLE_wxwidgets OFF CACHE BOOL "Enable wxwidgets bindings" FORCE) -endif(PLD_wxwidgets) +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." + "setting ENABLE_wxwidgets to OFF." ) set(ENABLE_wxwidgets OFF CACHE BOOL "Enable wxwidgets bindings" FORCE) endif(ENABLE_wxwidgets AND NOT ENABLE_cxx) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2007-04-13 17:39:42
|
Revision: 7675 http://plplot.svn.sourceforge.net/plplot/?rev=7675&view=rev Author: airwin Date: 2007-04-13 10:39:43 -0700 (Fri, 13 Apr 2007) Log Message: ----------- Warning message when wxWidgets not found. Modified Paths: -------------- trunk/cmake/modules/wxwidgets.cmake Modified: trunk/cmake/modules/wxwidgets.cmake =================================================================== --- trunk/cmake/modules/wxwidgets.cmake 2007-04-13 17:19:23 UTC (rev 7674) +++ trunk/cmake/modules/wxwidgets.cmake 2007-04-13 17:39:43 UTC (rev 7675) @@ -31,6 +31,10 @@ find_package(wxWidgets QUIET) if( NOT wxWidgets_FOUND ) + message(STATUS + "WARNING: wxWidgets not found so " + "setting PLD_wxwidgets to OFF." + ) set(PLD_wxwidgets OFF CACHE BOOL "Enable wxwidgets device" FORCE) endif( NOT wxWidgets_FOUND ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2007-10-22 15:03:02
|
Revision: 7963 http://plplot.svn.sourceforge.net/plplot/?rev=7963&view=rev Author: airwin Date: 2007-10-22 08:03:06 -0700 (Mon, 22 Oct 2007) Log Message: ----------- If PLD_wxwidgets is OFF, do not look for the wxwidgets library since it is not needed in that case. Modified Paths: -------------- trunk/cmake/modules/wxwidgets.cmake Modified: trunk/cmake/modules/wxwidgets.cmake =================================================================== --- trunk/cmake/modules/wxwidgets.cmake 2007-10-22 00:27:04 UTC (rev 7962) +++ trunk/cmake/modules/wxwidgets.cmake 2007-10-22 15:03:06 UTC (rev 7963) @@ -27,17 +27,18 @@ # DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. # Find wxWidgets needed for driver and bindings -SET(wxWidgets_USE_LIBS core base) -find_package(wxWidgets QUIET) +if(PLD_wxwidgets) + SET(wxWidgets_USE_LIBS core base) + find_package(wxWidgets QUIET) + if(NOT wxWidgets_FOUND) + message(STATUS + "WARNING: wxWidgets not found so " + "setting PLD_wxwidgets to OFF." + ) + set(PLD_wxwidgets OFF CACHE BOOL "Enable wxwidgets device" FORCE) + endif(NOT wxWidgets_FOUND) +endif(PLD_wxwidgets) -if( NOT wxWidgets_FOUND ) - message(STATUS - "WARNING: wxWidgets not found so " - "setting PLD_wxwidgets to OFF." - ) - set(PLD_wxwidgets OFF CACHE BOOL "Enable wxwidgets device" FORCE) -endif( NOT wxWidgets_FOUND ) - if(PLD_wxwidgets) string(REGEX REPLACE ";" " -I" wxwidgets_COMPILE_FLAGS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2008-02-06 15:06:43
|
Revision: 8215 http://plplot.svn.sourceforge.net/plplot/?rev=8215&view=rev Author: smekal Date: 2008-02-06 07:05:46 -0800 (Wed, 06 Feb 2008) Log Message: ----------- Removed line which led to configuration problems on Windows. Modified Paths: -------------- trunk/cmake/modules/wxwidgets.cmake Modified: trunk/cmake/modules/wxwidgets.cmake =================================================================== --- trunk/cmake/modules/wxwidgets.cmake 2008-02-06 13:30:21 UTC (rev 8214) +++ trunk/cmake/modules/wxwidgets.cmake 2008-02-06 15:05:46 UTC (rev 8215) @@ -28,7 +28,6 @@ # Find wxWidgets needed for driver and bindings if(PLD_wxwidgets) - SET(wxWidgets_USE_LIBS core base) find_package(wxWidgets QUIET) if(NOT wxWidgets_FOUND) message(STATUS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-03-23 19:57:45
|
Revision: 8321 http://plplot.svn.sourceforge.net/plplot/?rev=8321&view=rev Author: airwin Date: 2008-03-23 12:57:51 -0700 (Sun, 23 Mar 2008) Log Message: ----------- Allow wxWidgets_DEFINITIONS to be a blank-delimited string (cmake 2.4.8) or a list (cmake cvs version). Modified Paths: -------------- trunk/cmake/modules/wxwidgets.cmake Modified: trunk/cmake/modules/wxwidgets.cmake =================================================================== --- trunk/cmake/modules/wxwidgets.cmake 2008-03-23 15:19:29 UTC (rev 8320) +++ trunk/cmake/modules/wxwidgets.cmake 2008-03-23 19:57:51 UTC (rev 8321) @@ -39,10 +39,19 @@ 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} ${wxWidgets_DEFINITIONS}" + "-I${wxWidgets_INCLUDE_DIRS}" ) + # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8) + # when wxWidgets_DEFINITIONS is a list. + string(REGEX REPLACE ";" " " + wxwidgets_COMPILE_FLAGS + ${wxwidgets_COMPILE_FLAGS} + " ${wxWidgets_DEFINITIONS}" + ) set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES}) if(WITH_FREETYPE) set( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-04-18 00:44:57
|
Revision: 8379 http://plplot.svn.sourceforge.net/plplot/?rev=8379&view=rev Author: airwin Date: 2008-04-17 17:45:02 -0700 (Thu, 17 Apr 2008) Log Message: ----------- Convert wxWidgets_LIBRARIES to full pathname form. Modified Paths: -------------- trunk/cmake/modules/wxwidgets.cmake Modified: trunk/cmake/modules/wxwidgets.cmake =================================================================== --- trunk/cmake/modules/wxwidgets.cmake 2008-04-17 18:29:17 UTC (rev 8378) +++ trunk/cmake/modules/wxwidgets.cmake 2008-04-18 00:45:02 UTC (rev 8379) @@ -23,8 +23,10 @@ # PLD_wxwidgets - ON means the wxwidgets device is enabled. # wxwidgets_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets # device. -# wxwidgets_LINK_FLAGS - individual LINK_FLAGS for dynamic wxwidgets device. -# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. +# wxwidgets_LINK_FLAGS - list of full path names of libraries and +# linker flags for dynamic wxwidgets device driver. +# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case +# when ENABLE_DYNDRIVERS OFF. # Find wxWidgets needed for driver and bindings if(PLD_wxwidgets) @@ -52,7 +54,8 @@ ${wxwidgets_COMPILE_FLAGS} " ${wxWidgets_DEFINITIONS}" ) - set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES}) + # Convert wxWidgets_LIBRARIES to full pathname form. + cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") if(WITH_FREETYPE) set( wxwidgets_COMPILE_FLAGS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |