I am pretty good (if I do say so myself) at making wholesale changes
to our source code using the killer combination of find, grep, and sed.
So I volunteered to do such needed changes for the WIN32 case for Arjen,
and revision 12411 is the result. The wholesale changes were
WIN32 AND NOT CYGWIN ==> WIN32_AND_NOT_CYGWIN
WIN32 ==> WIN32_OR_CYGWIN
In addition our top-level CMakeLists.txt file was changed
to
1. Force the modern CMake interpretation (where WIN32 is false on
Cygwin platforms)
2. define the variables WIN32_AND_NOT_CYGWIN and WIN32_OR_CYGWIN
>From now on the variable WIN32 should not be used in our build system
code except under extraordinary circumstances which are currently.
software@raven> find -name CMakeLists.txt -o -name "*.cmake" | \
grep -v build_projects |xargs grep '[^_]WIN32[^_]'
./cmake/modules/summary.cmake:WIN32: ${WIN32}
./examples/c++/CMakeLists.txt: add_executable(wxPLplotDemo WIN32
wxPLplotDemo.cpp)
./CMakeLists.txt:# Force CMake to _NOT_ define 'WIN32' on Cygwin
./CMakeLists.txt:set(WIN32_AND_NOT_CYGWIN ${WIN32})
./CMakeLists.txt:if(WIN32 OR CYGWIN)
./CMakeLists.txt:else(WIN32 OR CYGWIN)
./CMakeLists.txt:endif(WIN32 OR CYGWIN)
./CMakeLists.txt:if(BUILD_SHARED_LIBS AND WIN32)
./CMakeLists.txt:endif(BUILD_SHARED_LIBS AND WIN32)
./CMakeLists.txt:if(WIN32)
./CMakeLists.txt:else(WIN32)
./CMakeLists.txt:endif(WIN32)
Instead, the variables WIN32_AND_NOT_CYGWIN, WIN32_OR_CYGWIN, or
CYGWIN should be used as appropriate.
Arjen, there are no guarantees with such wholesale changes, but please
give revision 12411 a try on your Cygwin platform and make further
build-system changes as required for that platform using the CMake
variables WIN32_AND_NOT_CYGWIN, WIN32_OR_CYGWIN, or CYGWIN.
Alan
__________________________
Alan W. Irwin
Astronomical research affiliation with Department of Physics and Astronomy,
University of Victoria (astrowww.phys.uvic.ca).
Programming affiliations with the FreeEOS equation-of-state
implementation for stellar interiors (freeeos.sf.net); the Time
Ephemerides project (timeephem.sf.net); PLplot scientific plotting
software package (plplot.sf.net); the libLASi project
(unifont.org/lasi); the Loads of Linux Links project (loll.sf.net);
and the Linux Brochure Project (lbproject.sf.net).
__________________________
Linux-powered Science
__________________________
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Plplot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/plplot-devel
