From: <sm...@us...> - 2008-11-20 09:22:43
|
Revision: 9003 http://plplot.svn.sourceforge.net/plplot/?rev=9003&view=rev Author: smekal Date: 2008-11-20 09:22:31 +0000 (Thu, 20 Nov 2008) Log Message: ----------- The FindGDI32.cmake module is not needed anymore. The GDI32 must be always provided by the compiler and the library is now searched for in wingcc.cmake. This has also the advantage, that the full path to the library is determined. Removed Paths: ------------- trunk/cmake/modules/FindGDI32.c trunk/cmake/modules/FindGDI32.cmake Deleted: trunk/cmake/modules/FindGDI32.c =================================================================== --- trunk/cmake/modules/FindGDI32.c 2008-11-20 09:18:57 UTC (rev 9002) +++ trunk/cmake/modules/FindGDI32.c 2008-11-20 09:22:31 UTC (rev 9003) @@ -1,8 +0,0 @@ -#include <windows.h> - -int main() -{ - HDC hDC=NULL; - RECT clientRect; - DPtoLP(hDC, (LPPOINT)&clientRect, 2); -} Deleted: trunk/cmake/modules/FindGDI32.cmake =================================================================== --- trunk/cmake/modules/FindGDI32.cmake 2008-11-20 09:18:57 UTC (rev 9002) +++ trunk/cmake/modules/FindGDI32.cmake 2008-11-20 09:22:31 UTC (rev 9003) @@ -1,44 +0,0 @@ -# Find gdi32 header and library for wingcc driver -# - -# This module defines the following uncached variables: -# GDI32_FOUND, if false, do not try to use gdi32. -# GDI32_LIBRARIES, the libraries to link against to use gdi32 - -# Borland compiler doesn't know the gdi32 library -IF(NOT BORLAND) - find_library(GDI32_LIBRARY gdi32) -ENDIF(NOT BORLAND) - -if(BORLAND OR GDI32_LIBRARY) - try_compile(TESTGDI32 - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/cmake/modules/FindGDI32.c - CMAKE_FLAGS -DLINK_LIBRARIES=${GDI32_LIBRARY} - OUTPUT_VARIABLE OUTPUT) - if(TESTGDI32) - set(GDI32_FOUND ON) - set(GDI32_LIBRARIES ${GDI32_LIBRARY}) - file(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log - "Determining if gdi32 is available passed with " - "the following output:\n${OUTPUT}\n\n") - else(TESTGDI32) - set(GDI32_FOUND OFF) - set(GDI32_LIBRARIES "") - file(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log - "Determining if gdi32 is available failed with " - "the following output:\n${OUTPUT}\n\n") - endif(TESTGDI32) -endif(BORLAND OR GDI32_LIBRARY) - -if(GDI32_FOUND) - if(NOT GDI32_FIND_QUIETLY) - message(STATUS "FindGDI32: Found gdi32 header file and library") - endif(NOT GDI32_FIND_QUIETLY) -else(GDI32_FOUND) - if(GDI32_FIND_REQUIRED) - message(FATAL_ERROR - "FindGDI32: Could not find gdi32 header file and/or library" - ) - endif(GDI32_FIND_REQUIRED) -endif(GDI32_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2008-12-18 08:29:01
|
Revision: 9181 http://plplot.svn.sourceforge.net/plplot/?rev=9181&view=rev Author: smekal Date: 2008-12-18 08:28:58 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Add the wxpng device which is turned OFF by default in the moment. Modified Paths: -------------- trunk/cmake/modules/drivers-init.cmake trunk/cmake/modules/wxwidgets.cmake Modified: trunk/cmake/modules/drivers-init.cmake =================================================================== --- trunk/cmake/modules/drivers-init.cmake 2008-12-18 08:13:40 UTC (rev 9180) +++ trunk/cmake/modules/drivers-init.cmake 2008-12-18 08:28:58 UTC (rev 9181) @@ -127,6 +127,7 @@ "tkwin:tkwin:ON" "wingcc:wingcc:ON" "wxwidgets:wxwidgets:ON" +"wxpng:wxwidgets:OFF" "xfig:xfig:ON" "xwin:xwin:ON" ) Modified: trunk/cmake/modules/wxwidgets.cmake =================================================================== --- trunk/cmake/modules/wxwidgets.cmake 2008-12-18 08:13:40 UTC (rev 9180) +++ trunk/cmake/modules/wxwidgets.cmake 2008-12-18 08:28:58 UTC (rev 9181) @@ -29,7 +29,10 @@ # when ENABLE_DYNDRIVERS OFF. # Find wxWidgets needed for driver and bindings -if(PLD_wxwidgets) +if( + PLD_wxwidgets +OR PLD_wxpng +) find_package(wxWidgets QUIET) if(NOT wxWidgets_FOUND) message(STATUS @@ -37,13 +40,20 @@ "setting PLD_wxwidgets 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) # Check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H) include(TestForStdintCXX) endif(NOT wxWidgets_FOUND) -endif(PLD_wxwidgets) +endif( + PLD_wxwidgets +OR PLD_wxpng +) -if(PLD_wxwidgets) +if( + PLD_wxwidgets +OR PLD_wxpng +) string(REGEX REPLACE ";" " -I" wxwidgets_COMPILE_FLAGS "-I${wxWidgets_INCLUDE_DIRS}" @@ -84,7 +94,10 @@ ${DRIVERS_LINK_FLAGS} ${wxwidgets_LINK_FLAGS} ) -endif(PLD_wxwidgets) +endif( + PLD_wxwidgets +OR PLD_wxpng +) if(DEFAULT_NO_BINDINGS) option(ENABLE_wxwidgets "Enable wxwidgets bindings" OFF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-15 20:17:31
|
Revision: 10149 http://plplot.svn.sourceforge.net/plplot/?rev=10149&view=rev Author: airwin Date: 2009-07-15 20:17:12 +0000 (Wed, 15 Jul 2009) Log Message: ----------- Implement graceful recovery if no working C++ compiler. Modified Paths: -------------- trunk/cmake/modules/octave.cmake trunk/cmake/modules/psttf.cmake Modified: trunk/cmake/modules/octave.cmake =================================================================== --- trunk/cmake/modules/octave.cmake 2009-07-15 19:47:17 UTC (rev 10148) +++ trunk/cmake/modules/octave.cmake 2009-07-15 20:17:12 UTC (rev 10149) @@ -26,6 +26,12 @@ option(ENABLE_octave "Enable Octave bindings" ON) endif(DEFAULT_NO_BINDINGS) +if(ENABLE_octave AND NOT CMAKE_CXX_COMPILER_WORKS) + message(STATUS "WARNING: " + "Octave requires working C++ compiler to build. Disabling octave bindings") + set(ENABLE_octave OFF CACHE BOOL "Enable Octave bindings" FORCE) +endif(ENABLE_octave AND NOT CMAKE_CXX_COMPILER_WORKS) + if(ENABLE_octave AND NOT BUILD_SHARED_LIBS) message(STATUS "WARNING: " "Octave requires shared libraries. Disabling octave bindings") Modified: trunk/cmake/modules/psttf.cmake =================================================================== --- trunk/cmake/modules/psttf.cmake 2009-07-15 19:47:17 UTC (rev 10148) +++ trunk/cmake/modules/psttf.cmake 2009-07-15 20:17:12 UTC (rev 10149) @@ -36,6 +36,15 @@ # set the environment variable CMAKE_LIBRARY_PATH. # See cmake documentation for further details. +if(PLD_psttf) + if(NOT CMAKE_CXX_COMPILER_WORKS) + message(STATUS "WARNING: no working C++ compiler so " + "setting psttf device to OFF." + ) + set(PLD_psttf OFF CACHE BOOL "Enable psttf device" FORCE) + endif(NOT CMAKE_CXX_COMPILER_WORKS) +endif(PLD_psttf) + # Look for psttf headers and libraries with pkg-config if(PLD_psttf) if(NOT PKG_CONFIG_EXECUTABLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-15 20:23:39
|
Revision: 10150 http://plplot.svn.sourceforge.net/plplot/?rev=10150&view=rev Author: airwin Date: 2009-07-15 20:23:29 +0000 (Wed, 15 Jul 2009) Log Message: ----------- We have now removed the necessity of having a working C++ compiler from the PLplot build. For c++.cmake use simple warning messages (just like all other languages) if a working C++ compiler cannot be found. Also, only do all further extra C++ checks if there is a working C++ compiler. For plplot.cmake, move the include(c++) line back to its normal location within plplot.cmake (since check_prototype_exists no longer depends on a working C++ compiler). Modified Paths: -------------- trunk/cmake/modules/c++.cmake trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/c++.cmake =================================================================== --- trunk/cmake/modules/c++.cmake 2009-07-15 20:17:12 UTC (rev 10149) +++ trunk/cmake/modules/c++.cmake 2009-07-15 20:23:29 UTC (rev 10150) @@ -28,50 +28,40 @@ OPTION(ENABLE_cxx "Enable C++ bindings" ON) endif(DEFAULT_NO_BINDINGS) -# Always carry out C++ checks, since C++ used for more than just -# C++ bindings. -set(alwayscxx ON) - # OPTIONAL below currently does not work properly with CMake so attempt # to deal with a possibly missing compiler first as a workaround. -if(alwayscxx OR ENABLE_cxx) +if(ENABLE_cxx) include(CMakeDetermineCXXCompiler) if(NOT CMAKE_CXX_COMPILER) - # This is FATAL_ERROR rather than STATUS message because C++ absolutely - # required for check_prototype_exists test (and perhaps other preliminary - # tests as well). - message(FATAL_ERROR "C++ compiler absolutely required to build this project.") message(STATUS "WARNING: C++ compiler not found so disabling C++ bindings and examples.") set(ENABLE_cxx OFF CACHE BOOL "Enable C++ bindings" FORCE) endif(NOT CMAKE_CXX_COMPILER) -endif(alwayscxx OR ENABLE_cxx) +endif(ENABLE_cxx) -if(alwayscxx OR ENABLE_cxx) +if(ENABLE_cxx) # Find and check C++ compiler. enable_language(CXX OPTIONAL) if(NOT CMAKE_CXX_COMPILER_WORKS) - # This is FATAL_ERROR rather than STATUS message because C++ absolutely - # required for check_prototype_exists test (and perhaps other preliminary - # tests as well). - message(FATAL_ERROR "C++ compiler absolutely required to build this project.") message(STATUS "No working C++ compiler found so PLplot cannot be built.") set(ENABLE_cxx OFF CACHE BOOL "Enable C++ bindings" FORCE) endif(NOT CMAKE_CXX_COMPILER_WORKS) -endif(alwayscxx OR ENABLE_cxx) +endif(ENABLE_cxx) -# Check if "using namespace std;" works -INCLUDE(TestForNamespace) +if(ENABLE_cxx) + # Check if "using namespace std;" works + INCLUDE(TestForNamespace) -# Check for <cmath> -INCLUDE(CheckIncludeFileCXX) -CHECK_INCLUDE_FILE_CXX(cmath HAVE_CMATH) + # Check for <cmath> + INCLUDE(CheckIncludeFileCXX) + CHECK_INCLUDE_FILE_CXX(cmath HAVE_CMATH) -if(NOT MSVC) - # Need to add check for broken cmath with isnan missing (BROKEN_ISNAN_CXX) - # but not for Visual C++ compilers - include(TestBrokenIsnanCXX) -endif(NOT MSVC) + if(NOT MSVC) + # Need to add check for broken cmath with isnan missing (BROKEN_ISNAN_CXX) + # but not for Visual C++ compilers + include(TestBrokenIsnanCXX) + endif(NOT MSVC) -# Need to add check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H) -INCLUDE(TestForStdintCXX) + # Need to add check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H) + INCLUDE(TestForStdintCXX) +endif(ENABLE_cxx) Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-07-15 20:17:12 UTC (rev 10149) +++ trunk/cmake/modules/plplot.cmake 2009-07-15 20:23:29 UTC (rev 10150) @@ -123,9 +123,6 @@ # the ctype.h' macros work on characters with the high bit set, as # ANSI C requires. -# check_prototype_exists requires C++ -include(c++) - message(STATUS "Checking whether system has ANSI C header files") check_include_files("stdlib.h;stdarg.h;string.h;float.h" StandardHeadersExist) if(StandardHeadersExist) @@ -382,8 +379,7 @@ "All language bindings are disabled by default" OFF ) -# Load language specific files -# C++ done much earlier because check_prototype_exists macro requires it. +include(c++) include(fortran) include(java) include(python) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-16 18:44:00
|
Revision: 10153 http://plplot.svn.sourceforge.net/plplot/?rev=10153&view=rev Author: airwin Date: 2009-07-16 18:43:59 +0000 (Thu, 16 Jul 2009) Log Message: ----------- Remove attempted workaround for CMake enable_language OPTIONAL signature bug which is described at http://public.kitware.com/Bug/view.php?id=9220. Since that OPTIONAL signature was not working, the idea of the workaround was to pre-search for the compiler by using "include(CMakeDetermine<language>Compiler)". If this check revealed the compiler was missing, we could then avoid the call to enable_language (which incorrectly errors out rather than warns when a compiler is missing). However, it turns out this workaround causes cache issues (undefined language-related variables) if the ccmake CLI or cmake-gui GUI are used rather than the cmake application for configuring PLplot. Thus, drop the workaround and accept the hard landing (CMake error) instead. This hard landing will occur whenever a user fails to disable a language (Ada, C++, D, Fortran, or Java) when the corresponding language development environment (compiler and associated libraries) is not installed on his computer. The fundamental solution to this issue is to get the CMake developers to address bug 9220 so the OPTIONAL signature of enable_language actually avoids erroring out when the language development environment is missing/broken. But this will take some time. Modified Paths: -------------- trunk/cmake/modules/ada.cmake trunk/cmake/modules/c++.cmake trunk/cmake/modules/d.cmake trunk/cmake/modules/fortran.cmake trunk/cmake/modules/java.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2009-07-16 17:21:51 UTC (rev 10152) +++ trunk/cmake/modules/ada.cmake 2009-07-16 18:43:59 UTC (rev 10153) @@ -25,17 +25,7 @@ option(ENABLE_ada "Enable Ada bindings" ON) endif(DEFAULT_NO_BINDINGS) -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. if(ENABLE_ada) - include(CMakeDetermineAdaCompiler) - if(NOT CMAKE_Ada_COMPILER) - message(STATUS "WARNING: Ada compiler not found so disabling Ada bindings and examples.") - set(ENABLE_ada OFF CACHE BOOL "Enable Ada bindings" FORCE) - endif(NOT CMAKE_Ada_COMPILER) -endif(ENABLE_ada) - -if(ENABLE_ada) # Find and check Ada compiler enable_language(Ada OPTIONAL) if(NOT CMAKE_Ada_COMPILER_WORKS) Modified: trunk/cmake/modules/c++.cmake =================================================================== --- trunk/cmake/modules/c++.cmake 2009-07-16 17:21:51 UTC (rev 10152) +++ trunk/cmake/modules/c++.cmake 2009-07-16 18:43:59 UTC (rev 10153) @@ -28,17 +28,7 @@ OPTION(ENABLE_cxx "Enable C++ bindings" ON) endif(DEFAULT_NO_BINDINGS) -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. if(ENABLE_cxx) - include(CMakeDetermineCXXCompiler) - if(NOT CMAKE_CXX_COMPILER) - message(STATUS "WARNING: C++ compiler not found so disabling C++ bindings and examples.") - set(ENABLE_cxx OFF CACHE BOOL "Enable C++ bindings" FORCE) - endif(NOT CMAKE_CXX_COMPILER) -endif(ENABLE_cxx) - -if(ENABLE_cxx) # Find and check C++ compiler. enable_language(CXX OPTIONAL) Modified: trunk/cmake/modules/d.cmake =================================================================== --- trunk/cmake/modules/d.cmake 2009-07-16 17:21:51 UTC (rev 10152) +++ trunk/cmake/modules/d.cmake 2009-07-16 18:43:59 UTC (rev 10153) @@ -28,17 +28,7 @@ option(ENABLE_d "Enable D bindings" OFF) endif(DEFAULT_NO_BINDINGS) -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. if(ENABLE_d) - include(CMakeDetermineDCompiler) - if(NOT CMAKE_D_COMPILER) - message(STATUS "WARNING: D compiler not found so disabling D bindings and examples.") - set(ENABLE_d OFF CACHE BOOL "Enable D bindings" FORCE) - endif(NOT CMAKE_D_COMPILER) -endif(ENABLE_d) - -if(ENABLE_d) # Find and check D compiler enable_language(D OPTIONAL) if(NOT CMAKE_D_COMPILER_WORKS) Modified: trunk/cmake/modules/fortran.cmake =================================================================== --- trunk/cmake/modules/fortran.cmake 2009-07-16 17:21:51 UTC (rev 10152) +++ trunk/cmake/modules/fortran.cmake 2009-07-16 18:43:59 UTC (rev 10153) @@ -30,18 +30,7 @@ option(ENABLE_f95 "Enable f95 bindings" ON) endif(DEFAULT_NO_BINDINGS) -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. if(ENABLE_f77 OR ENABLE_f95) - include(CMakeDetermineFortranCompiler) - if(NOT CMAKE_Fortran_COMPILER) - message(STATUS "WARNING: Fortran compiler not found so disabling Fortran bindings and examples.") - set(ENABLE_f77 OFF CACHE BOOL "Enable f77 bindings" FORCE) - set(ENABLE_f95 OFF CACHE BOOL "Enable f95 bindings" FORCE) - endif(NOT CMAKE_Fortran_COMPILER) -endif(ENABLE_f77 OR ENABLE_f95) - -if(ENABLE_f77 OR ENABLE_f95) # Find and check Fortran compiler. enable_language(Fortran OPTIONAL) if(NOT CMAKE_Fortran_COMPILER_WORKS) Modified: trunk/cmake/modules/java.cmake =================================================================== --- trunk/cmake/modules/java.cmake 2009-07-16 17:21:51 UTC (rev 10152) +++ trunk/cmake/modules/java.cmake 2009-07-16 18:43:59 UTC (rev 10153) @@ -40,17 +40,7 @@ set(ENABLE_java OFF CACHE BOOL "Enable Java bindings" FORCE) endif(ENABLE_java AND NOT SWIG_FOUND) -# OPTIONAL below currently does not work properly with CMake so attempt -# to deal with a possibly missing compiler first as a workaround. if(ENABLE_java) - include(CMakeDetermineJavaCompiler) - if(NOT CMAKE_Java_COMPILER) - message(STATUS "WARNING: Java compiler not found so disabling Java bindings and examples.") - set(ENABLE_java OFF CACHE BOOL "Enable Java bindings" FORCE) - endif(NOT CMAKE_Java_COMPILER) -endif(ENABLE_java) - -if(ENABLE_java) # Find and check Java compiler. enable_language(Java OPTIONAL) if(NOT CMAKE_Java_COMPILER_WORKS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-08-24 14:31:23
|
Revision: 10321 http://plplot.svn.sourceforge.net/plplot/?rev=10321&view=rev Author: airwin Date: 2009-08-24 14:31:13 +0000 (Mon, 24 Aug 2009) Log Message: ----------- Silently drop aqt device driver if not Darwin. Silently drop wingcc device driver if not Windows (WIN32). These two changes means it is possible on a fully loaded Linux system to have a WARNING-free cmake result even when -DDEFAULT_ALL_DEVICES=ON. Modified Paths: -------------- trunk/cmake/modules/aqt.cmake trunk/cmake/modules/wingcc.cmake Modified: trunk/cmake/modules/aqt.cmake =================================================================== --- trunk/cmake/modules/aqt.cmake 2009-08-24 14:02:24 UTC (rev 10320) +++ trunk/cmake/modules/aqt.cmake 2009-08-24 14:31:13 UTC (rev 10321) @@ -27,15 +27,19 @@ # DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static device drivers. # -include(FindAQT) +# Darwin-only device driver. +if(PLD_aqt AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(PLD_aqt OFF CACHE BOOL "Enable aqt device" FORCE) +endif(PLD_aqt AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") -IF (AQT_FOUND) - MESSAGE(STATUS "Found AQT: ${AQT_FRAMEWORK}") - IF (PLD_aqt) - SET(aqt_COMPILE_FLAGS "-ObjC") - SET(aqt_LINK_FLAGS "-framework AquaTerm -framework Foundation") - SET(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${aqt_LINK_FLAGS}) - ENDIF (PLD_aqt) -ELSE (AQT_FOUND) - SET(PLD_aqt OFF CACHE BOOL "Enable aqt device" FORCE) -ENDIF (AQT_FOUND) +if(PLD_aqt) + include(FindAQT) + if(AQT_FOUND) + message(STATUS "Found AQT: ${AQT_FRAMEWORK}") + set(aqt_COMPILE_FLAGS "-ObjC") + set(aqt_LINK_FLAGS "-framework AquaTerm -framework Foundation") + set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${aqt_LINK_FLAGS}) + else(AQT_FOUND) + set(PLD_aqt OFF CACHE BOOL "Enable aqt device" FORCE) + endif(AQT_FOUND) +endif(PLD_aqt) Modified: trunk/cmake/modules/wingcc.cmake =================================================================== --- trunk/cmake/modules/wingcc.cmake 2009-08-24 14:02:24 UTC (rev 10320) +++ trunk/cmake/modules/wingcc.cmake 2009-08-24 14:31:13 UTC (rev 10321) @@ -27,6 +27,11 @@ # wingcc device. # DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. +# Windows-only device driver. +if(PLD_wingcc AND NOT WIN32) + set(PLD_wingcc OFF CACHE BOOL "Enable wingcc device" FORCE) +endif(PLD_wingcc AND NOT WIN32) + if(PLD_wingcc) message(STATUS "Looking for gdi32 header and library") find_library(GDI32_LIBRARY gdi32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2012-10-02 16:08:38
|
Revision: 12232 http://plplot.svn.sourceforge.net/plplot/?rev=12232&view=rev Author: airwin Date: 2012-10-02 16:08:29 +0000 (Tue, 02 Oct 2012) Log Message: ----------- Put the checks for XML::Parser and XML::DOM in a more central location where they are guaranteed to happen (if perl is available). This means these perl modules can be used for, e.g., parsing swig documentation regardless of whether octave and/or docbook have been enabled or not. A further advantage of this new location for the checks is these checks are not independently repeated for the octave and docbook cases. Modified Paths: -------------- trunk/cmake/modules/docbook.cmake trunk/cmake/modules/octave.cmake trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/docbook.cmake =================================================================== --- trunk/cmake/modules/docbook.cmake 2012-09-07 16:56:47 UTC (rev 12231) +++ trunk/cmake/modules/docbook.cmake 2012-10-02 16:08:29 UTC (rev 12232) @@ -74,10 +74,6 @@ set(EC_PDFTEX ec) endif(EC_ENC_NAME) - if(PERL_FOUND) - check_perl_modules(PERL_XML_PARSER XML::Parser) - check_perl_modules(PERL_XML_DOM XML::DOM) - endif(PERL_FOUND) find_program(DB2X_TEXIXML db2x_texixml) if(NOT DB2X_TEXIXML) message(STATUS "WARNING: db2x_texixml not found") Modified: trunk/cmake/modules/octave.cmake =================================================================== --- trunk/cmake/modules/octave.cmake 2012-09-07 16:56:47 UTC (rev 12231) +++ trunk/cmake/modules/octave.cmake 2012-10-02 16:08:29 UTC (rev 12232) @@ -208,8 +208,6 @@ endif(ENABLE_octave) if(ENABLE_octave) - check_perl_modules(PERL_XML_PARSER XML::Parser) - check_perl_modules(PERL_XML_DOM XML::DOM) #MATWRAP is the path+filename of the matwrap script. set(MATWRAP "${CMAKE_CURRENT_SOURCE_DIR}/bindings/octave/matwrap/matwrap") message(STATUS "MATWRAP = ${MATWRAP}") Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2012-09-07 16:56:47 UTC (rev 12231) +++ trunk/cmake/modules/plplot.cmake 2012-10-02 16:08:29 UTC (rev 12232) @@ -380,12 +380,15 @@ endif(SWIG_FOUND) # Find Perl. Required in several places in the build system (e.g., -# tcl and docbook). +# tcl and docbook). Also check for XML::Parser and XML::DOM which +# are also used several places in the build system. find_package(Perl) if(PERL_FOUND) include(CheckPerlModules) + check_perl_modules(PERL_XML_PARSER XML::Parser) + check_perl_modules(PERL_XML_DOM XML::DOM) endif(PERL_FOUND) - + # ======================================================================= # pkg-config support as well as macros to put link flags in standard # *.pc (pkg-config) form as well as standard fullpath form used by cmake. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-10-03 13:08:49
|
Revision: 12234 http://plplot.svn.sourceforge.net/plplot/?rev=12234&view=rev Author: andrewross Date: 2012-10-03 13:08:38 +0000 (Wed, 03 Oct 2012) Log Message: ----------- Add in cmake support for shapelib library to read in shapefiles. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake trunk/cmake/modules/summary.cmake Added Paths: ----------- trunk/cmake/modules/FindShapelib.cmake trunk/cmake/modules/shapelib.cmake Added: trunk/cmake/modules/FindShapelib.cmake =================================================================== --- trunk/cmake/modules/FindShapelib.cmake (rev 0) +++ trunk/cmake/modules/FindShapelib.cmake 2012-10-03 13:08:38 UTC (rev 12234) @@ -0,0 +1,36 @@ +# Find shapelib header and library. +# + +# This module defines the following uncached variables: +# SHAPELIB_FOUND, if false, do not try to use shapelib. +# SHAPELIB_INCLUDE_DIRS, where to find shapefil.h. +# SHAPELIB_LIBRARIES, the libraries to link against to use shapelib +# SHAPELIB_LIBRARY_DIRS, the directory where libshp (either shared or static) +# is found. + +find_path(SHAPELIB_INCLUDE_DIR shapefil.h /usr/local/include /usr/include) + +if(SHAPELIB_INCLUDE_DIR) + find_library(SHAPELIB_LIBRARY + NAMES shp + PATHS /usr/local/lib /usr/lib + ) + if(SHAPELIB_LIBRARY) + set(SHAPELIB_LIBRARY_DIR "") + get_filename_component(SHAPELIB_LIBRARY_DIRS ${SHAPELIB_LIBRARY} PATH) + # Set uncached variables as per standard. + set(SHAPELIB_FOUND ON) + set(SHAPELIB_INCLUDE_DIRS ${SHAPELIB_INCLUDE_DIR}) + set(SHAPELIB_LIBRARIES ${SHAPELIB_LIBRARY}) + endif(SHAPELIB_LIBRARY) +endif(SHAPELIB_INCLUDE_DIR) + +if(SHAPELIB_FOUND) + if(NOT SHAPELIB_FIND_QUIETLY) + message(STATUS "FindShapelib: Found shapelib header directory, ${SHAPELIB_INCLUDE_DIR}, and library, ${SHAPELIB_LIBRARIES}.") + endif(NOT SHAPELIB_FIND_QUIETLY) +else(SHAPELIB_FOUND) + if(SHAPELIB_FIND_REQUIRED) + message(FATAL_ERROR "FindShapelib: Could not find shapelib header and/or library.") + endif(SHAPELIB_FIND_REQUIRED) +endif(SHAPELIB_FOUND) Property changes on: trunk/cmake/modules/FindShapelib.cmake ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2012-10-02 20:13:08 UTC (rev 12233) +++ trunk/cmake/modules/plplot.cmake 2012-10-03 13:08:38 UTC (rev 12234) @@ -441,6 +441,9 @@ message(STATUS "X11_COMPILE_FLAGS = ${X11_COMPILE_FLAGS}") message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}") +# Support for shapelib library for reading shapefile map data +include(shapelib) + option(DEFAULT_NO_BINDINGS "All language bindings are disabled by default" OFF Added: trunk/cmake/modules/shapelib.cmake =================================================================== --- trunk/cmake/modules/shapelib.cmake (rev 0) +++ trunk/cmake/modules/shapelib.cmake 2012-10-03 13:08:38 UTC (rev 12234) @@ -0,0 +1,40 @@ +# cmake/modules/shapefil.cmake +# +# Copyright (C) 2012 Andrew Ross +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with the file PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Configuration for SHAPELIB support in plplot. + +option( +HAVE_SHAPELIB +"Enable driver options for using shapelib library for reading shapefile map data" +ON +) + +# Look for shapelib libraries +if (HAVE_SHAPELIB) + find_package(Shapelib) + if(NOT SHAPELIB_FOUND) + message(STATUS + "WARNING: SHAPELIB not found. Setting HAVE_SHAPELIB to OFF." + ) + set(HAVE_SHAPELIB OFF + CACHE BOOL "Enable driver options for using SHAPELIB library for reading shapefile map data" + FORCE + ) + endif(NOT SHAPELIB_FOUND) +endif (HAVE_SHAPELIB) Property changes on: trunk/cmake/modules/shapelib.cmake ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/cmake/modules/summary.cmake =================================================================== --- trunk/cmake/modules/summary.cmake 2012-10-02 20:13:08 UTC (rev 12233) +++ trunk/cmake/modules/summary.cmake 2012-10-03 13:08:38 UTC (rev 12234) @@ -107,7 +107,7 @@ Optional libraries: PL_HAVE_QHULL: ${PL_HAVE_QHULL} WITH_CSA: ${WITH_CSA} HAVE_FREETYPE: ${HAVE_FREETYPE} PL_HAVE_PTHREAD: ${PL_HAVE_PTHREAD} -HAVE_AGG: ${HAVE_AGG} +HAVE_AGG: ${HAVE_AGG} HAVE_SHAPELIB: ${HAVE_SHAPELIB} Language Bindings: ENABLE_f77: ${ENABLE_f77} ENABLE_f95: ${ENABLE_f95} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2012-10-30 01:31:25
|
Revision: 12260 http://plplot.svn.sourceforge.net/plplot/?rev=12260&view=rev Author: airwin Date: 2012-10-30 01:31:18 +0000 (Tue, 30 Oct 2012) Log Message: ----------- Adjust to backwards-incompatible change in CMake language support infrastructure that is introduced as of CMake-2.8.10. Result works for CMake-2.8.10-rc3 as well as previous CMake versions. Modified Paths: -------------- trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake trunk/cmake/modules/language_support.cmake trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake =================================================================== --- trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake 2012-10-30 01:29:43 UTC (rev 12259) +++ trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake 2012-10-30 01:31:18 UTC (rev 12260) @@ -55,8 +55,11 @@ # configure variables set in this file for fast reload later on #CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeAdaCompiler.cmake.in +#message(STATUS "DEBUG: CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}") +#message(STATUS "DEBUG: CMAKE_FILES_DIRECTORY = ${CMAKE_FILES_DIRECTORY}") +#message(STATUS "DEBUG: CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}") CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeAdaCompiler.cmake" IMMEDIATE) + "${CMAKE_PLATFORM_INFO_DIR}/CMakeAdaCompiler.cmake" IMMEDIATE) MARK_AS_ADVANCED(CMAKE_AR) SET(CMAKE_Ada_COMPILER_ENV_VAR "ADA") Modified: trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake =================================================================== --- trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake 2012-10-30 01:29:43 UTC (rev 12259) +++ trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake 2012-10-30 01:31:18 UTC (rev 12260) @@ -99,10 +99,10 @@ # a different location. IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in - "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE) + "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE) ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in - "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE) + "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE) ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) MARK_AS_ADVANCED(CMAKE_AR) Modified: trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake =================================================================== --- trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2012-10-30 01:29:43 UTC (rev 12259) +++ trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2012-10-30 01:31:18 UTC (rev 12260) @@ -68,10 +68,10 @@ # a different location. IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE) + ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE) ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE) + ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE) ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in) ENDIF(NOT CMAKE_D_COMPILER_WORKS) Modified: trunk/cmake/modules/language_support.cmake =================================================================== --- trunk/cmake/modules/language_support.cmake 2012-10-30 01:29:43 UTC (rev 12259) +++ trunk/cmake/modules/language_support.cmake 2012-10-30 01:31:18 UTC (rev 12260) @@ -19,6 +19,13 @@ ${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake ${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake-2.8 ) + +# Need to define CMAKE_PLATFORM_INFO_DIR for all CMake versions less than 2.8.10 +if(NOT CMAKE_PLATFORM_INFO_DIR) + set(CMAKE_PLATFORM_INFO_DIR \${CMAKE_BINARY_DIR}\${CMAKE_FILES_DIRECTORY}) + message(STATUS 'CMAKE_PLATFORM_INFO_DIR = \${CMAKE_PLATFORM_INFO_DIR}') +endif(NOT CMAKE_PLATFORM_INFO_DIR) + if(CMAKE_SYSTEM_NAME STREQUAL \"Linux\") # We prefer to support only the latest CMake version because it # tends to be more free of issues and more consistent with recent Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2012-10-30 01:29:43 UTC (rev 12259) +++ trunk/cmake/modules/plplot.cmake 2012-10-30 01:31:18 UTC (rev 12260) @@ -448,6 +448,13 @@ "All language bindings are disabled by default" OFF ) + +# Need to define CMAKE_PLATFORM_INFO_DIR for all CMake versions less than 2.8.10 +if(NOT CMAKE_PLATFORM_INFO_DIR) + set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}) + message(STATUS "CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}") +endif(NOT CMAKE_PLATFORM_INFO_DIR) + # Temporary workaround for language support that is required. include(language_support) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-05-01 04:14:26
|
Revision: 12314 http://sourceforge.net/p/plplot/code/12314 Author: airwin Date: 2013-05-01 04:14:20 +0000 (Wed, 01 May 2013) Log Message: ----------- Disable all bindings but ocaml by default to eliminate build breakage caused by recent C API breakage when the user chooses the default bindings. To enable these bindings again by default for their language of choice, the interested developer should propagate the recent integer ==> double line width changes in the C API for pl*shade*, pllegend, and plcolorbar to their bindings of choice, make the appropriate changes in examples 4, 16, 26, and 33 to use the changed API, and test the result (at least by running the test_noninteractive target) with the language specifically enabled, e.g., with the -DENABLE_python=ON option. If that testing works, then the final step is to enable the language by default again, and commit your changes. Modified Paths: -------------- trunk/cmake/modules/ada.cmake trunk/cmake/modules/c++.cmake trunk/cmake/modules/d.cmake trunk/cmake/modules/fortran.cmake trunk/cmake/modules/java.cmake trunk/cmake/modules/lua.cmake trunk/cmake/modules/octave.cmake trunk/cmake/modules/pdl.cmake trunk/cmake/modules/python.cmake trunk/cmake/modules/tcl-related.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/ada.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -22,7 +22,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_ada "Enable Ada bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_ada "Enable Ada bindings" ON) + option(ENABLE_ada "Enable Ada bindings" OFF) endif(DEFAULT_NO_BINDINGS) if(ENABLE_ada AND NOT PLPLOT_Ada_COMPILER_WORKS) Modified: trunk/cmake/modules/c++.cmake =================================================================== --- trunk/cmake/modules/c++.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/c++.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -25,7 +25,7 @@ if(DEFAULT_NO_BINDINGS) OPTION(ENABLE_cxx "Enable C++ bindings" OFF) else(DEFAULT_NO_BINDINGS) - OPTION(ENABLE_cxx "Enable C++ bindings" ON) + OPTION(ENABLE_cxx "Enable C++ bindings" OFF) endif(DEFAULT_NO_BINDINGS) if(NOT PLPLOT_CXX_COMPILER_WORKS) Modified: trunk/cmake/modules/d.cmake =================================================================== --- trunk/cmake/modules/d.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/d.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -25,7 +25,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_d "Enable D bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_d "Enable D bindings" ON) + option(ENABLE_d "Enable D bindings" OFF) endif(DEFAULT_NO_BINDINGS) if(ENABLE_d AND NOT PLPLOT_D_COMPILER_WORKS) Modified: trunk/cmake/modules/fortran.cmake =================================================================== --- trunk/cmake/modules/fortran.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/fortran.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -27,7 +27,7 @@ option(ENABLE_f95 "Enable f95 bindings" OFF) else(DEFAULT_NO_BINDINGS) option(ENABLE_f77 "Enable f77 bindings" OFF) - option(ENABLE_f95 "Enable f95 bindings" ON) + option(ENABLE_f95 "Enable f95 bindings" OFF) endif(DEFAULT_NO_BINDINGS) if(ENABLE_f77 OR ENABLE_f95) Modified: trunk/cmake/modules/java.cmake =================================================================== --- trunk/cmake/modules/java.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/java.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -25,7 +25,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_java "Enable Java bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_java "Enable Java bindings" ON) + option(ENABLE_java "Enable Java bindings" OFF) endif(DEFAULT_NO_BINDINGS) if(ENABLE_java AND NOT BUILD_SHARED_LIBS) Modified: trunk/cmake/modules/lua.cmake =================================================================== --- trunk/cmake/modules/lua.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/lua.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -25,7 +25,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_lua "Enable Lua bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_lua "Enable Lua bindings" ON) + option(ENABLE_lua "Enable Lua bindings" OFF) endif(DEFAULT_NO_BINDINGS) if(ENABLE_lua AND NOT BUILD_SHARED_LIBS) Modified: trunk/cmake/modules/octave.cmake =================================================================== --- trunk/cmake/modules/octave.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/octave.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -23,7 +23,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_octave "Enable Octave bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_octave "Enable Octave bindings" ON) + option(ENABLE_octave "Enable Octave bindings" OFF) endif(DEFAULT_NO_BINDINGS) if(ENABLE_octave AND NOT CMAKE_CXX_COMPILER_WORKS) Modified: trunk/cmake/modules/pdl.cmake =================================================================== --- trunk/cmake/modules/pdl.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/pdl.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -23,7 +23,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_pdl "Enable Perl/PDL examples in tests" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_pdl "Enable Perl/PDL examples in tests" ON) + option(ENABLE_pdl "Enable Perl/PDL examples in tests" OFF) endif(DEFAULT_NO_BINDINGS) if(ENABLE_pdl) Modified: trunk/cmake/modules/python.cmake =================================================================== --- trunk/cmake/modules/python.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/python.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -23,7 +23,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_python "Enable Python bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_python "Enable Python bindings" ON) + option(ENABLE_python "Enable Python bindings" OFF) endif(DEFAULT_NO_BINDINGS) if(ENABLE_python AND NOT BUILD_SHARED_LIBS) Modified: trunk/cmake/modules/tcl-related.cmake =================================================================== --- trunk/cmake/modules/tcl-related.cmake 2013-05-01 01:12:18 UTC (rev 12313) +++ trunk/cmake/modules/tcl-related.cmake 2013-05-01 04:14:20 UTC (rev 12314) @@ -26,10 +26,10 @@ option(ENABLE_tk "Enable Tk interface code" OFF) option(ENABLE_itk "Enable incr TK interface code" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_tcl "Enable Tcl bindings" ON) - option(ENABLE_itcl "Enable incr Tcl interface code" ON) - option(ENABLE_tk "Enable Tk interface code" ON) - option(ENABLE_itk "Enable incr TK interface code" ON) + option(ENABLE_tcl "Enable Tcl bindings" OFF) + option(ENABLE_itcl "Enable incr Tcl interface code" OFF) + option(ENABLE_tk "Enable Tk interface code" OFF) + option(ENABLE_itk "Enable incr TK interface code" OFF) endif(DEFAULT_NO_BINDINGS) # Depending on these above options and system resources may also determine This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-12-11 09:01:38
|
Revision: 12848 http://sourceforge.net/p/plplot/code/12848 Author: airwin Date: 2013-12-11 09:01:35 +0000 (Wed, 11 Dec 2013) Log Message: ----------- Improve filter_rpath function by taking advantage of the well-documented and maintained CMAKE_C_IMPLICIT_LINK_DIRECTORIES, CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES, and CMAKE_FORTRAN_IMPLICIT_LINK_DIRECTORIES variables to clean rpath information of standard directory locations instead of using the undocumented/poorly maintained internal variable CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES for the same task. The new set of variables is only available after C, CXX, and FORTRAN have been enabled so move include of shapelib module (which uses filter_rpath) to after when all the languages are defined. This fix sorted out an issue with the rpath used for qt_example which was being contaminated by a system location and thus giving the wrong location when a non-standard Qt location is used. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake trunk/cmake/modules/plplot_functions.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2013-12-11 08:37:43 UTC (rev 12847) +++ trunk/cmake/modules/plplot.cmake 2013-12-11 09:01:35 UTC (rev 12848) @@ -444,9 +444,6 @@ message(STATUS "X11_COMPILE_FLAGS = ${X11_COMPILE_FLAGS}") message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}") -# Support for shapelib library for reading shapefile map data -include(shapelib) - option(DEFAULT_NO_BINDINGS "All language bindings are disabled by default" OFF @@ -512,6 +509,8 @@ # ======================================================================= # additional library support # ======================================================================= +# Support for shapelib library for reading shapefile map data +include(shapelib) include(freetype) # On windows systems the math library is not separated so do not specify # it unless you are on a non-windows system. Modified: trunk/cmake/modules/plplot_functions.cmake =================================================================== --- trunk/cmake/modules/plplot_functions.cmake 2013-12-11 08:37:43 UTC (rev 12847) +++ trunk/cmake/modules/plplot_functions.cmake 2013-12-11 09:01:35 UTC (rev 12848) @@ -186,16 +186,31 @@ list(REMOVE_DUPLICATES CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) endif(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) -# Filter all CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES list elements from -# rpath_in list. +# Filter all CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES list elements from +# rpath_in list. Note, this uses variables that are only defined after +# languages have been enabled but according to the documentation the +# logic is only invoked when the function is invoked so this should be +# OK _if care is used that this function is invoked only after the +# languages have been enabled_. C is enabled immediately so that will +# serve most purposes, but CXX and Fortran are enabled later so if +# you want those special system locations removed (unlikely but +# possible) then you are going to have to be somewhat more careful +# when this function is invoked. + function(filter_rpath rpath) #message("DEBUG: ${rpath} = ${${rpath}}") set(internal_rpath ${${rpath}}) if(internal_rpath) list(REMOVE_DUPLICATES internal_rpath) - if(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) - list(REMOVE_ITEM internal_rpath ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}) - endif(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) + set(directories_to_be_removed + ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} + ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES} + ${CMAKE_FORTRAN_IMPLICIT_LINK_DIRECTORIES} + ) + list(REMOVE_DUPLICATES directories_to_be_removed) + if(directories_to_be_removed) + list(REMOVE_ITEM internal_rpath ${directories_to_be_removed}) + endif(directories_to_be_removed) endif(internal_rpath) #message("DEBUG: (filtered) ${rpath} = ${internal_rpath}") set(${rpath} ${internal_rpath} PARENT_SCOPE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-24 00:55:30
|
Revision: 9223 http://plplot.svn.sourceforge.net/plplot/?rev=9223&view=rev Author: airwin Date: 2008-12-24 00:55:23 +0000 (Wed, 24 Dec 2008) Log Message: ----------- Output location information when libltdl and/or libfreetype are found. Modified Paths: -------------- trunk/cmake/modules/drivers.cmake trunk/cmake/modules/freetype.cmake Modified: trunk/cmake/modules/drivers.cmake =================================================================== --- trunk/cmake/modules/drivers.cmake 2008-12-24 00:46:23 UTC (rev 9222) +++ trunk/cmake/modules/drivers.cmake 2008-12-24 00:55:23 UTC (rev 9223) @@ -53,6 +53,9 @@ find_package(LTDL) if(LTDL_FOUND) set(libplplot${LIB_TAG}_RPATH ${LTDL_LIBRARY_DIR}) + message(STATUS "LTDL_INCLUDE_DIR = ${LTDL_INCLUDE_DIR}") + message(STATUS "LTDL_LIBRARY_DIR = ${LTDL_LIBRARY_DIR}") + message(STATUS "LTDL_LIBRARIES = ${LTDL_LIBRARIES}") else(LTDL_FOUND) message(STATUS "WARNING: libltdl library not found. Setting ENABLE_DYNDRIVERS OFF.\n" Modified: trunk/cmake/modules/freetype.cmake =================================================================== --- trunk/cmake/modules/freetype.cmake 2008-12-24 00:46:23 UTC (rev 9222) +++ trunk/cmake/modules/freetype.cmake 2008-12-24 00:55:23 UTC (rev 9223) @@ -28,12 +28,15 @@ # Look for freetype libraries if (WITH_FREETYPE) find_package(Freetype) - if (NOT FREETYPE_FOUND) + if (FREETYPE_FOUND) + message(STATUS "FREETYPE_INCLUDE_DIR = ${FREETYPE_INCLUDE_DIR}") + message(STATUS "FREETYPE_LIBRARIES = ${FREETYPE_LIBRARIES}") + else (FREETYPE_FOUND) set(WITH_FREETYPE OFF CACHE BOOL "Enable driver options for using freetype library for fonts" FORCE ) - endif (NOT FREETYPE_FOUND) + endif (FREETYPE_FOUND) endif (WITH_FREETYPE) if (WITH_FREETYPE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-01-19 09:20:04
|
Revision: 9342 http://plplot.svn.sourceforge.net/plplot/?rev=9342&view=rev Author: smekal Date: 2009-01-19 09:19:53 +0000 (Mon, 19 Jan 2009) Log Message: ----------- CMake build system changes to locate the Lua libraries (5.0) needed for the Lua bindings. The Lua bindings are disabled by default. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake trunk/cmake/modules/summary.cmake Added Paths: ----------- trunk/cmake/modules/lua.cmake Added: trunk/cmake/modules/lua.cmake =================================================================== --- trunk/cmake/modules/lua.cmake (rev 0) +++ trunk/cmake/modules/lua.cmake 2009-01-19 09:19:53 UTC (rev 9342) @@ -0,0 +1,53 @@ +# cmake/modules/lua.cmake +# +# LUA binding configuration +# +# Copyright (C) 2008 Werner Smekal +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with the file PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# Module for determining LUA bindings configuration options + +# Options to enable LUA bindings +if(DEFAULT_NO_BINDINGS) + option(ENABLE_lua "Enable LUA bindings" OFF) +else(DEFAULT_NO_BINDINGS) + option(ENABLE_lua "Enable LUA bindings" OFF) +endif(DEFAULT_NO_BINDINGS) + +if(ENABLE_lua AND NOT BUILD_SHARED_LIBS) + message(STATUS "WARNING: " + "Lua requires shared libraries. Disabling lua bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE) +endif(ENABLE_lua AND NOT BUILD_SHARED_LIBS) + +if(ENABLE_lua AND NOT SWIG_FOUND) + message(STATUS "WARNING: " + "swig not found. Disabling LUA bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE) +endif(ENABLE_lua AND NOT SWIG_FOUND) + +if(ENABLE_lua) + # Check for Lua libraries which defines + # LUA_LIBRARIES = path to the lua library + # LUA_INCLUDE_DIR = path to where lua.h is found + find_package(Lua50) + if(NOT LUA50_FOUND) + message(STATUS "WARNING: " + "lua library and/or header not found. Disabling lua bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE) + endif(NOT LUA50_FOUND) +endif(ENABLE_lua) Property changes on: trunk/cmake/modules/lua.cmake ___________________________________________________________________ Added: svn:executable + * Added: svn:eol-style + native Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-01-19 09:14:48 UTC (rev 9341) +++ trunk/cmake/modules/plplot.cmake 2009-01-19 09:19:53 UTC (rev 9342) @@ -311,6 +311,7 @@ include(pdl) include(ada) include(ocaml) +include(lua) # ======================================================================= # additional library support Modified: trunk/cmake/modules/summary.cmake =================================================================== --- trunk/cmake/modules/summary.cmake 2009-01-19 09:14:48 UTC (rev 9341) +++ trunk/cmake/modules/summary.cmake 2009-01-19 09:19:53 UTC (rev 9342) @@ -117,7 +117,7 @@ ENABLE_pdl: ${ENABLE_pdl} ENABLE_wxwidgets: ${ENABLE_wxwidgets} ENABLE_gnome2: ${ENABLE_gnome2} ENABLE_pygcw: ${ENABLE_pygcw} ENABLE_ada: ${ENABLE_ada} ENABLE_d: ${ENABLE_d} -ENABLE_ocaml: ${ENABLE_ocaml} +ENABLE_ocaml: ${ENABLE_ocaml} ENABLE_lua: ${ENABLE_lua} ") message("${_output_results}") endmacro(summary) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-01-24 20:32:24
|
Revision: 9382 http://plplot.svn.sourceforge.net/plplot/?rev=9382&view=rev Author: airwin Date: 2009-01-24 20:32:18 +0000 (Sat, 24 Jan 2009) Log Message: ----------- Standardize FindAGG.cmake. This solves a wxwidgets linking bug (missing aggfontfreetype_pic library in libraries that were linked) that occurred whenever cmake was run from cached results (i.e., whenever the user did not use a fresh build tree). The bad linking lead to widespread segfaults for wxwidgets which should now be gone. Modified Paths: -------------- trunk/cmake/modules/FindAGG.cmake trunk/cmake/modules/agg.cmake trunk/cmake/modules/wxwidgets.cmake Modified: trunk/cmake/modules/FindAGG.cmake =================================================================== --- trunk/cmake/modules/FindAGG.cmake 2009-01-24 13:38:21 UTC (rev 9381) +++ trunk/cmake/modules/FindAGG.cmake 2009-01-24 20:32:18 UTC (rev 9382) @@ -1,75 +1,71 @@ # - Try to find the AGG graphics library -# Once done this will define +# Once done this will define in uncached variables # # AGG_FOUND - system has AGG -# AGG_INCLUDE_DIR - the AGG include directory -# AGG_LIBRARIES - Link these to use AGG +# AGG_INCLUDE_DIRS - the AGG include directories # AGG_DEFINITIONS - Compiler switches required for using AGG +# AGG_LIBRARIES - Link these to use AGG # -if (AGG_INCLUDE_DIR AND AGG_LIBRARIES) +if(PKG_CONFIG_EXECUTABLE) + # Use pkg-config (if available) to provide location of AGG headers and + # libraries and also provide basis for defining AGG_DEFINITIONS. + pkg_check_pkgconfig(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags _AGG) + #message(STATUS "_AGGIncDir = ${_AGGIncDir}") + #message(STATUS "_AGGLinkDir = ${_AGGLinkDir}") + #message(STATUS "_AGGLinkFlags = ${_AGGLinkFlags}") + #message(STATUS "_AGGCflags = ${_AGGCflags}") +endif(PKG_CONFIG_EXECUTABLE) - # in cache already - SET(AGG_FOUND TRUE) +FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h + ${_AGGIncDir} + /usr/local/include + /usr/include + ) -else (AGG_INCLUDE_DIR AND AGG_LIBRARIES) - - if(PKG_CONFIG_EXECUTABLE) - pkg_check_pkgconfig(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags _AGG) - #message(STATUS "_AGGIncDir = ${_AGGIncDir}") - #message(STATUS "_AGGLinkDir = ${_AGGLinkDir}") - #message(STATUS "_AGGLinkFlags = ${_AGGLinkFlags}") - #message(STATUS "_AGGCflags = ${_AGGCflags}") - - # Blank-delimited is required. - string(REGEX REPLACE ";" " " AGG_DEFINITIONS "${_AGGCflags}") - endif(PKG_CONFIG_EXECUTABLE) - - FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h - ${_AGGIncDir} - /usr/local/include - /usr/include +# Prefer _pic variant of library name for shared libraries case, and +# plain name for static libraries case. +if(BUILD_SHARED_LIBS) + set(AGGLIB_NAMES = "agg_pic;agg") + set(AGGFONTLIB_NAMES = "aggfontfreetype_pic;aggfontfreetype") +else(BUILD_SHARED_LIBS) + set(AGGLIB_NAMES = "agg;agg_pic") + set(AGGFONTLIB_NAMES = "aggfontfreetype;aggfontfreetype_pic;") +endif(BUILD_SHARED_LIBS) +FIND_LIBRARY(AGG_LIBRARY NAMES ${AGGLIB_NAMES} + PATHS + ${_AGGLinkDir} + /usr/local/lib + /usr/lib ) - - # Prefer _pic variant of library name for shared libraries case, and - # plain name for static libraries case. - if(BUILD_SHARED_LIBS) - set(AGGLIB_NAMES = "agg_pic;agg") - set(AGGFONTLIB_NAMES = "aggfontfreetype_pic;aggfontfreetype") - else(BUILD_SHARED_LIBS) - set(AGGLIB_NAMES = "agg;agg_pic") - set(AGGFONTLIB_NAMES = "aggfontfreetype;aggfontfreetype_pic;") - endif(BUILD_SHARED_LIBS) - FIND_LIBRARY(AGG_LIBRARIES NAMES ${AGGLIB_NAMES} - PATHS - ${_AGGLinkDir} - /usr/local/lib - /usr/lib +FIND_LIBRARY(AGGFONT_LIBRARY NAMES ${AGGFONTLIB_NAMES} + PATHS + ${_AGGLinkDir} + /usr/local/lib + /usr/lib ) - FIND_LIBRARY(AGGFONT_LIBRARIES NAMES ${AGGFONTLIB_NAMES} - PATHS - ${_AGGLinkDir} - /usr/local/lib - /usr/lib - ) - if (AGGFONT_LIBRARIES AND AGG_LIBRARIES) - set(AGG_LIBRARIES ${AGG_LIBRARIES} ${AGGFONT_LIBRARIES}) - endif (AGGFONT_LIBRARIES AND AGG_LIBRARIES) + +MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARY AGGFONT_LIBRARY) + +# Set uncached variable AGG_LIBRARIES (needed by user and also +# by FIND_PACKAGE_HANDLE_STANDARD_ARGS) +if(AGG_LIBRARY AND AGGFONT_LIBRARY) + set(AGG_LIBRARIES ${AGG_LIBRARY} ${AGGFONT_LIBRARY}) +elseif(AGG_LIBRARY) + set(AGG_LIBRARIES ${AGG_LIBRARY}) +endif(AGG_LIBRARY AND AGGFONT_LIBRARY) + +# Standard 2.6.x method of handling QUIETLY and REQUIRED arguments and set +# AGG_FOUND to TRUE if all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(AGG DEFAULT_MSG AGG_LIBRARIES AGG_INCLUDE_DIR) + +if(AGG_FOUND) + # Set additional uncached variables that users of this module should use. + + set(AGG_INCLUDE_DIRS ${AGG_INCLUDE_DIR}) - if (AGG_INCLUDE_DIR AND AGG_LIBRARIES) - set(AGG_FOUND TRUE) - endif (AGG_INCLUDE_DIR AND AGG_LIBRARIES) - - if (AGG_FOUND) - if (NOT AGG_FIND_QUIETLY) - message(STATUS "Found AGG: ${AGG_LIBRARIES}") - endif (NOT AGG_FIND_QUIETLY) - else (AGG_FOUND) - if (AGG_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find AGG") - endif (AGG_FIND_REQUIRED) - endif (AGG_FOUND) - - MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARIES) - -endif (AGG_INCLUDE_DIR AND AGG_LIBRARIES) + # Blank-delimited is required. + string(REGEX REPLACE ";" " " AGG_DEFINITIONS "${_AGGCflags}") + +endif(AGG_FOUND) Modified: trunk/cmake/modules/agg.cmake =================================================================== --- trunk/cmake/modules/agg.cmake 2009-01-24 13:38:21 UTC (rev 9381) +++ trunk/cmake/modules/agg.cmake 2009-01-24 20:32:18 UTC (rev 9382) @@ -25,17 +25,6 @@ ON ) -#if(HAVE_AGG) -# if(NOT PKG_CONFIG_EXECUTABLE) -# message(STATUS -# "WARNING: pkg-config not found. Setting HAVE_AGG to OFF." -# ) -# set(HAVE_AGG OFF -# CACHE BOOL "Enable driver options for using AGG library for antializing" -# FORCE -# ) -# endif(NOT PKG_CONFIG_EXECUTABLE) -#endif(HAVE_AGG) # Look for agg libraries if (HAVE_AGG) find_package(AGG) Modified: trunk/cmake/modules/wxwidgets.cmake =================================================================== --- trunk/cmake/modules/wxwidgets.cmake 2009-01-24 13:38:21 UTC (rev 9381) +++ trunk/cmake/modules/wxwidgets.cmake 2009-01-24 20:32:18 UTC (rev 9382) @@ -29,76 +29,62 @@ # when ENABLE_DYNDRIVERS OFF. # Find wxWidgets needed for driver and bindings -if( - PLD_wxwidgets -OR PLD_wxpng -) +if(PLD_wxwidgets OR PLD_wxpng) find_package(wxWidgets QUIET) if(NOT wxWidgets_FOUND) message(STATUS - "WARNING: wxWidgets not found so " - "setting PLD_wxwidgets to OFF." - ) + "WARNING: wxWidgets not found so " + "setting PLD_wxwidgets 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) - # Check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H) - include(TestForStdintCXX) + # Check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H) + include(TestForStdintCXX) endif(NOT wxWidgets_FOUND) -endif( - PLD_wxwidgets -OR PLD_wxpng -) - -if( - PLD_wxwidgets -OR PLD_wxpng -) +endif(PLD_wxwidgets OR PLD_wxpng) +if(PLD_wxwidgets OR PLD_wxpng) string(REGEX REPLACE ";" " -I" - wxwidgets_COMPILE_FLAGS - "-I${wxWidgets_INCLUDE_DIRS}" - ) + wxwidgets_COMPILE_FLAGS + "-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}" - ) + wxwidgets_COMPILE_FLAGS + ${wxwidgets_COMPILE_FLAGS} + " ${wxWidgets_DEFINITIONS}" + ) # Convert wxWidgets_LIBRARIES to full pathname form. cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") include(agg) if(HAVE_AGG) set( - wxwidgets_COMPILE_FLAGS - "${wxwidgets_COMPILE_FLAGS} -I${AGG_INCLUDE_DIR}" - ) + wxwidgets_COMPILE_FLAGS + "${wxwidgets_COMPILE_FLAGS} -I${AGG_INCLUDE_DIRS}" + ) set( - wxwidgets_LINK_FLAGS - ${wxwidgets_LINK_FLAGS} - ${AGG_LIBRARIES} - ) + wxwidgets_LINK_FLAGS + ${wxwidgets_LINK_FLAGS} + ${AGG_LIBRARIES} + ) endif(HAVE_AGG) if(WITH_FREETYPE) set( - wxwidgets_COMPILE_FLAGS - "${wxwidgets_COMPILE_FLAGS} -I${FREETYPE_INCLUDE_DIR}" - ) + wxwidgets_COMPILE_FLAGS + "${wxwidgets_COMPILE_FLAGS} -I${FREETYPE_INCLUDE_DIR}" + ) set( - wxwidgets_LINK_FLAGS - ${wxwidgets_LINK_FLAGS} - ${FREETYPE_LIBRARIES} - ) + wxwidgets_LINK_FLAGS + ${wxwidgets_LINK_FLAGS} + ${FREETYPE_LIBRARIES} + ) endif(WITH_FREETYPE) set(DRIVERS_LINK_FLAGS - ${DRIVERS_LINK_FLAGS} - ${wxwidgets_LINK_FLAGS} - ) -endif( - PLD_wxwidgets -OR PLD_wxpng -) - + ${DRIVERS_LINK_FLAGS} + ${wxwidgets_LINK_FLAGS} + ) +endif(PLD_wxwidgets OR PLD_wxpng) if(DEFAULT_NO_BINDINGS) option(ENABLE_wxwidgets "Enable wxwidgets bindings" OFF) else(DEFAULT_NO_BINDINGS) @@ -107,17 +93,17 @@ if(ENABLE_wxwidgets AND NOT PLD_wxwidgets) message(STATUS - "WARNING: PLD_wxwidgets is OFF so " - "setting ENABLE_wxwidgets to OFF." - ) + "WARNING: PLD_wxwidgets is OFF so " + "setting ENABLE_wxwidgets to OFF." + ) 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." - ) + "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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2009-02-04 05:22:58
|
Revision: 9445 http://plplot.svn.sourceforge.net/plplot/?rev=9445&view=rev Author: arjenmarkus Date: 2009-02-04 05:22:55 +0000 (Wed, 04 Feb 2009) Log Message: ----------- Solve issue with testing for NaN-awareness on AIX (the changes are localised the test: an examination of the source code revealed that this is the only place where a system header file "nan.h" is used). Modified Paths: -------------- trunk/cmake/modules/TestNaNAware.c trunk/cmake/modules/csiro.cmake Modified: trunk/cmake/modules/TestNaNAware.c =================================================================== --- trunk/cmake/modules/TestNaNAware.c 2009-02-04 02:40:51 UTC (rev 9444) +++ trunk/cmake/modules/TestNaNAware.c 2009-02-04 05:22:55 UTC (rev 9445) @@ -1,11 +1,19 @@ /* Test for NaN awareness. */ #include <stdio.h> +#if defined(_AIX) +#include "math.h" +#else #include "nan.h" +#endif int main() { +#if defined(_AIX) + double x = NAN; +#else double x = NaN; +#endif /* N.B. CMake run-time tests need return of true (1) or false (0) not * the usual status code of 0 for success. */ #if defined(_MSC_VER) | defined(__BORLANDC__) Modified: trunk/cmake/modules/csiro.cmake =================================================================== --- trunk/cmake/modules/csiro.cmake 2009-02-04 02:40:51 UTC (rev 9444) +++ trunk/cmake/modules/csiro.cmake 2009-02-04 05:22:55 UTC (rev 9445) @@ -43,7 +43,7 @@ try_run(NaNAwareCCompiler COMPILE_RESULT ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/modules/TestNaNAware.c - CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${NAN_CFLAGS} -I${CMAKE_SOURCE_DIR}/lib/csa" + CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${NAN_CFLAGS} -I${CMAKE_SOURCE_DIR}/lib/csa -lm" OUTPUT_VARIABLE OUTPUT ) if(NOT COMPILE_RESULT) @@ -83,7 +83,7 @@ set(HAVE_QHULL OFF CACHE BOOL "Enable use of the Qhull library" FORCE) endif(QH_NEW_EXIST) else(QHULL_FOUND) - message(STATUS + message(STATUS "WARNING: qhull library not found. Setting HAVE_QHULL to OFF." ) set(HAVE_QHULL OFF CACHE BOOL "Enable use of the Qhull library" FORCE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-02-04 08:51:43
|
Revision: 9449 http://plplot.svn.sourceforge.net/plplot/?rev=9449&view=rev Author: airwin Date: 2009-02-04 08:51:40 +0000 (Wed, 04 Feb 2009) Log Message: ----------- Use ${MATH_LIB} to test nan awareness rather than -lm since the math library may not be available separately as libm on some systems (e.g., windows). On systems (e.g., Linux) with a separate math library, ${MATH_LIB} is defined to be the full pathname of the math library. That approach works fine on Linux, but it should be tested on other platforms (such as AIX, Mac OS X, and windows) as well to be sure this approach works cross-platform. Modified Paths: -------------- trunk/cmake/modules/csiro.cmake trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/csiro.cmake =================================================================== --- trunk/cmake/modules/csiro.cmake 2009-02-04 08:33:13 UTC (rev 9448) +++ trunk/cmake/modules/csiro.cmake 2009-02-04 08:51:40 UTC (rev 9449) @@ -43,7 +43,7 @@ try_run(NaNAwareCCompiler COMPILE_RESULT ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/modules/TestNaNAware.c - CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${NAN_CFLAGS} -I${CMAKE_SOURCE_DIR}/lib/csa -lm" + CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${NAN_CFLAGS} -I${CMAKE_SOURCE_DIR}/lib/csa ${MATH_LIB}" OUTPUT_VARIABLE OUTPUT ) if(NOT COMPILE_RESULT) Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-02-04 08:33:13 UTC (rev 9448) +++ trunk/cmake/modules/plplot.cmake 2009-02-04 08:51:40 UTC (rev 9449) @@ -317,7 +317,6 @@ # additional library support # ======================================================================= include(freetype) -include(csiro) # On windows systems the math library is not separated so do not specify # it unless you are on a non-windows system. if(NOT WIN32) @@ -326,7 +325,10 @@ message(FATAL_ERROR "Cannot find required math library") endif(NOT MATH_LIB) endif(NOT WIN32) +# Must come after MATH_LIB is defined (or not). +include(csiro) + # ======================================================================= # libpango support # ======================================================================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2009-02-11 05:22:00
|
Revision: 9504 http://plplot.svn.sourceforge.net/plplot/?rev=9504&view=rev Author: arjenmarkus Date: 2009-02-11 05:21:56 +0000 (Wed, 11 Feb 2009) Log Message: ----------- Changed detection of Itcl: leave finding the right (compatible) version to Tcl itself. This does not yet guarantee that the Itcl bindings can be turned on: for that we still need the header file and the library. Turning ENABLE_itcl on by default Modified Paths: -------------- trunk/cmake/modules/tcl-related.cmake Added Paths: ----------- trunk/cmake/modules/GetITCL_Version.tcl Added: trunk/cmake/modules/GetITCL_Version.tcl =================================================================== --- trunk/cmake/modules/GetITCL_Version.tcl (rev 0) +++ trunk/cmake/modules/GetITCL_Version.tcl 2009-02-11 05:21:56 UTC (rev 9504) @@ -0,0 +1,2 @@ +# Extract the version of Itcl +puts -nonewline [package require Itcl]; exit Property changes on: trunk/cmake/modules/GetITCL_Version.tcl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/cmake/modules/tcl-related.cmake =================================================================== --- trunk/cmake/modules/tcl-related.cmake 2009-02-11 03:26:39 UTC (rev 9503) +++ trunk/cmake/modules/tcl-related.cmake 2009-02-11 05:21:56 UTC (rev 9504) @@ -27,7 +27,7 @@ option(ENABLE_itk "Enable incr TK interface code" OFF) else(DEFAULT_NO_BINDINGS) option(ENABLE_tcl "Enable Tcl bindings" ON) - option(ENABLE_itcl "Enable incr Tcl interface code" OFF) + option(ENABLE_itcl "Enable incr Tcl interface code" ON) option(ENABLE_tk "Enable Tk interface code" OFF) option(ENABLE_itk "Enable incr TK interface code" OFF) endif(DEFAULT_NO_BINDINGS) @@ -88,31 +88,45 @@ message(STATUS "TCL_INCLUDE_PATH = ${TCL_INCLUDE_PATH}") message(STATUS "TCL_LIBRARY = ${TCL_LIBRARY}") if(ENABLE_itcl) - message(STATUS "Looking for itcl.h") - find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH}) - if(ITCL_INCLUDE_PATH) - message(STATUS "Looking for itcl.h - found") - message(STATUS "Looking for itcl library") + execute_process( + COMMAND ${TCL_TCLSH} CheckITCL_Available.tcl + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules + OUTPUT_VARIABLE AVAILABLE_ITCL) + if(AVAILABLE_ITCL) + execute_process( + COMMAND ${TCL_TCLSH} GetITCL_Version.tcl + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules + OUTPUT_VARIABLE itcl_library_versions) + message(STATUS "Looking for itcl.h") + find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH}) + if(ITCL_INCLUDE_PATH) + message(STATUS "Looking for itcl.h - found") + message(STATUS "Looking for itcl library") get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH) - set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) - foreach(version ${itcl_library_versions}) - find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH} - PATH_SUFFIXES itcl${version}) - endforeach(version ${itcl_library_versions}) - if(ITCL_LIBRARY) - message(STATUS "Looking for itcl library - found") - set(HAVE_ITCL ON) - find_path(HAVE_ITCLDECLS_H itclDecls.h ${TCL_INCLUDE_PATH}) - else(ITCL_LIBRARY) - message(STATUS "Looking for itcl library - not found") + set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) + foreach(version ${itcl_library_versions}) + find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH} + PATH_SUFFIXES itcl${version}) + endforeach(version ${itcl_library_versions}) + if(ITCL_LIBRARY) + message(STATUS "Looking for itcl library - found") + set(HAVE_ITCL ON) + find_path(HAVE_ITCLDECLS_H itclDecls.h ${TCL_INCLUDE_PATH}) + else(ITCL_LIBRARY) + message(STATUS "Looking for itcl library - not found") + message(STATUS "WARNING: Disabling incr Tcl interface code") + set(ENABLE_itcl OFF CACHE BOOL "Enable incr Tcl interface code" FORCE) + endif(ITCL_LIBRARY) + else(ITCL_INCLUDE_PATH) + message(STATUS "Looking for itcl.h - not found") message(STATUS "WARNING: Disabling incr Tcl interface code") set(ENABLE_itcl OFF CACHE BOOL "Enable incr Tcl interface code" FORCE) - endif(ITCL_LIBRARY) - else(ITCL_INCLUDE_PATH) - message(STATUS "Looking for itcl.h - not found") - message(STATUS "WARNING: Disabling incr Tcl interface code") + endif(ITCL_INCLUDE_PATH) + else(AVAILABLE_ITCL) + message(STATUS "Itcl not available or not compatible with current Tcl shell") + set(HAVE_ITCL OFF) set(ENABLE_itcl OFF CACHE BOOL "Enable incr Tcl interface code" FORCE) - endif(ITCL_INCLUDE_PATH) + endif(AVAILABLE_ITCL) endif(ENABLE_itcl) if(ENABLE_itcl) message(STATUS "ITCL_INCLUDE_PATH = ${ITCL_INCLUDE_PATH}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2009-02-15 13:22:14
|
Revision: 9528 http://plplot.svn.sourceforge.net/plplot/?rev=9528&view=rev Author: arjenmarkus Date: 2009-02-15 13:22:06 +0000 (Sun, 15 Feb 2009) Log Message: ----------- Improving detection of command-line support for FORTRAN 77 under Cygwin. Use the CMake variable that identifies the compiler instead of CMAKE_COMPILER_IS_GNUG77 - with gfortran that is no longer accurate. Reversed the return code in the auxiliary program: 1 is success, 0 is failed Modified Paths: -------------- trunk/cmake/modules/TestF77CmdLine.cmake trunk/cmake/modules/TestF77CmdLine.f Modified: trunk/cmake/modules/TestF77CmdLine.cmake =================================================================== --- trunk/cmake/modules/TestF77CmdLine.cmake 2009-02-13 22:10:27 UTC (rev 9527) +++ trunk/cmake/modules/TestF77CmdLine.cmake 2009-02-15 13:22:06 UTC (rev 9528) @@ -21,7 +21,7 @@ # Check if iargc() works IF(NOT DEFINED CMAKE_F77_CMD_LINE) - MESSAGE(STATUS "Check for using namespace support") + MESSAGE(STATUS "Check for f77 command line support") TRY_COMPILE(CMAKE_F77_CMD_LINE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/modules/TestF77CmdLine.f @@ -30,9 +30,10 @@ # Iargc support is broken for with g77 and shared libraries on cygwin # (as of 2005-12-05, but this problem has been known # for several years, see http://cygwin.com/ml/cygwin/2005-11/msg00891.html). - IF (CYGWIN AND CMAKE_COMPILER_IS_GNUG77) + IF (CYGWIN AND CMAKE_Fortran_COMPILER_ID MATCHES ".*g77.*") + MESSAGE(STATUS "Check for f77 command line support - turning off - ${CMAKE_Fortran_COMPILER_ID} ") SET (CMAKE_F77_CMD_LINE OFF) - ENDIF (CYGWIN AND CMAKE_COMPILER_IS_GNUG77) + ENDIF (CYGWIN AND CMAKE_Fortran_COMPILER_ID MATCHES ".*g77.*") IF (CMAKE_F77_CMD_LINE) MESSAGE(STATUS "Check for f77 command line support - found") @@ -46,7 +47,7 @@ SET (F77_CMD_LINE 0 CACHE INTERNAL "Does the f77 compiler support command line arguments") FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log - "Determining if the f77 compiler has command line argument support failedd with " + "Determining if the f77 compiler has command line argument support failed with " "the following output:\n${OUTPUT}\n\n") ENDIF (CMAKE_F77_CMD_LINE) ENDIF(NOT DEFINED CMAKE_F77_CMD_LINE) Modified: trunk/cmake/modules/TestF77CmdLine.f =================================================================== --- trunk/cmake/modules/TestF77CmdLine.f 2009-02-13 22:10:27 UTC (rev 9527) +++ trunk/cmake/modules/TestF77CmdLine.f 2009-02-15 13:22:06 UTC (rev 9528) @@ -13,9 +13,9 @@ c ran into one case (Cygwin) where under certain badly linked c circumstances, iargc() could return -1 if(narg.lt.0) then + call exit(0) + else call exit(1) - else - call exit(0) endif stop end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-02-26 20:13:45
|
Revision: 9624 http://plplot.svn.sourceforge.net/plplot/?rev=9624&view=rev Author: smekal Date: 2009-02-26 20:13:40 +0000 (Thu, 26 Feb 2009) Log Message: ----------- Replaced all occurences of "lua" with "Lua" since this is the correct name (lua.cmake). The Lua bindings are only build if the SWIG version is 1.3.36 or above and if double precision floating points are used. It might work with an older SWIG version, but I only tried it with 1.3.31 which was not "good" enough (lua.cmake). Added a space to a message (ocaml.cmake) Modified Paths: -------------- trunk/cmake/modules/lua.cmake trunk/cmake/modules/ocaml.cmake trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/lua.cmake =================================================================== --- trunk/cmake/modules/lua.cmake 2009-02-26 19:57:40 UTC (rev 9623) +++ trunk/cmake/modules/lua.cmake 2009-02-26 20:13:40 UTC (rev 9624) @@ -1,6 +1,6 @@ # cmake/modules/lua.cmake # -# LUA binding configuration +# Lua binding configuration # # Copyright (C) 2008 Werner Smekal # @@ -19,30 +19,45 @@ # along with the file PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# Module for determining LUA bindings configuration options +# Module for determining Lua bindings configuration options -# Options to enable LUA bindings +# Options to enable Lua bindings if(DEFAULT_NO_BINDINGS) - option(ENABLE_lua "Enable LUA bindings" OFF) + option(ENABLE_lua "Enable Lua bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_lua "Enable LUA bindings" ON) + option(ENABLE_lua "Enable Lua bindings" ON) endif(DEFAULT_NO_BINDINGS) if(ENABLE_lua AND NOT BUILD_SHARED_LIBS) message(STATUS "WARNING: " - "Lua requires shared libraries. Disabling lua bindings") - set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE) + "Lua requires shared libraries. Disabling Lua bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE) endif(ENABLE_lua AND NOT BUILD_SHARED_LIBS) if(ENABLE_lua AND NOT SWIG_FOUND) message(STATUS "WARNING: " - "swig not found. Disabling LUA bindings") - set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE) + "swig not found. Disabling Lua bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE) endif(ENABLE_lua AND NOT SWIG_FOUND) if(ENABLE_lua) + transform_version(NUMERICAL_SWIG_MINIMUM_VERSION_FOR_LUA "1.3.36") + transform_version(NUMERICAL_SWIG_VERSION "${SWIG_VERSION}") + if(NUMERICAL_SWIG_VERSION LESS "${NUMERICAL_SWIG_MINIMUM_VERSION_FOR_LUA}") + message(STATUS "WARNING: swig version too old for Lua bindings. Disabling Lua bindings.") + set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE) + endif(NUMERICAL_SWIG_VERSION LESS "${NUMERICAL_SWIG_MINIMUM_VERSION_FOR_LUA}") +endif(ENABLE_lua) + +if(ENABLE_lua AND NOT PL_DOUBLE) + message(STATUS "WARNING: " + "only single precision floating point. Disabling Lua bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE) +endif(ENABLE_lua AND NOT PL_DOUBLE) + +if(ENABLE_lua) # Check for Lua libraries which defines - # LUA_LIBRARIES = path to the lua library + # LUA_LIBRARIES = path to the Lua library # LUA_INCLUDE_DIR = path to where lua.h is found option(HAVE_lua51 "Lua version is 5.1" OFF) if(HAVE_lua51) @@ -59,8 +74,8 @@ endif(HAVE_lua51) if(NOT LUA_FOUND) message(STATUS "WARNING: " - "lua library and/or header not found. Disabling lua bindings") - set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE) + "Lua library and/or header not found. Disabling Lua bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE) endif(NOT LUA_FOUND) endif(ENABLE_lua) @@ -68,13 +83,13 @@ find_program(LUA_EXECUTABLE lua) if(NOT LUA_EXECUTABLE) message(STATUS "WARNING: " - "lua executable not found. Disabling lua bindings") - set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE) + "Lua executable not found. Disabling Lua bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE) endif(NOT LUA_EXECUTABLE) endif(ENABLE_lua) if(ENABLE_lua) - # Check whether you have found a lua executable that is consistent + # Check whether you have found a Lua executable that is consistent # with the library version. execute_process(COMMAND ${LUA_EXECUTABLE} -v OUTPUT_VARIABLE LUA_VERSION @@ -97,8 +112,8 @@ if(NOT LUA_VERSION_VALID) message(STATUS "WARNING: " - "lua executable found but version not consistent with library. Disabling lua bindings") - set(ENABLE_lua OFF CACHE BOOL "Enable LUA bindings" FORCE) + "Lua executable found but version not consistent with library. Disabling Lua bindings") + set(ENABLE_lua OFF CACHE BOOL "Enable Lua bindings" FORCE) endif(NOT LUA_VERSION_VALID) endif(ENABLE_lua) Modified: trunk/cmake/modules/ocaml.cmake =================================================================== --- trunk/cmake/modules/ocaml.cmake 2009-02-26 19:57:40 UTC (rev 9623) +++ trunk/cmake/modules/ocaml.cmake 2009-02-26 20:13:40 UTC (rev 9624) @@ -36,7 +36,7 @@ if (OCAMLBUILD) message(STATUS "OCAMLBUILD = ${OCAMLBUILD}") else (OCAMLBUILD) - message(STATUS "WARNING:" + message(STATUS "WARNING: " "ocamlbuild not found. Disabling ocaml bindings") set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml bindings" FORCE) endif (OCAMLBUILD) Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-02-26 19:57:40 UTC (rev 9623) +++ trunk/cmake/modules/plplot.cmake 2009-02-26 20:13:40 UTC (rev 9624) @@ -253,7 +253,7 @@ # Language bindings # ======================================================================= -# Find swig. Required for python and java bindings. +# Find swig. Required for python, java and Lua bindings. # N.B. all version tests done below need experimental FindSWIG.cmake which # is currently carried in this directory by PLplot, but which eventually # should get into CMake. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-03-09 22:05:53
|
Revision: 9692 http://plplot.svn.sourceforge.net/plplot/?rev=9692&view=rev Author: smekal Date: 2009-03-09 22:05:41 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Added files from CMakeD (http://www.dsource.org/projects/cmaked) by Selman Ulug and Tim Burrell necessary to determine available D compiler. Added Paths: ----------- trunk/cmake/modules/CMakeD Copyright.txt trunk/cmake/modules/CMakeDCompiler.cmake.in trunk/cmake/modules/CMakeDInformation.cmake trunk/cmake/modules/CMakeDetermineDCompiler.cmake trunk/cmake/modules/CMakeTestDCompiler.cmake Added: trunk/cmake/modules/CMakeD Copyright.txt =================================================================== --- trunk/cmake/modules/CMakeD Copyright.txt (rev 0) +++ trunk/cmake/modules/CMakeD Copyright.txt 2009-03-09 22:05:41 UTC (rev 9692) @@ -0,0 +1,30 @@ +CMakeD - CMake module for D Language + +Copyright (c) 2007, Selman Ulug <sel...@gm...> + Tim Burrell <tim...@gm...> + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Property changes on: trunk/cmake/modules/CMakeD Copyright.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/cmake/modules/CMakeDCompiler.cmake.in =================================================================== --- trunk/cmake/modules/CMakeDCompiler.cmake.in (rev 0) +++ trunk/cmake/modules/CMakeDCompiler.cmake.in 2009-03-09 22:05:41 UTC (rev 9692) @@ -0,0 +1,45 @@ +# +# CMakeD - CMake module for D Language +# +# Copyright (c) 2007, Selman Ulug <sel...@gm...> +# Tim Burrell <tim...@gm...> +# +# All rights reserved. +# +# See Copyright.txt for details. +# +# Modified from CMake 2.6.5 CMakeCCompiler.cmake.in +# See http://www.cmake.org/HTML/Copyright.html for details +# + +SET(CMAKE_D_COMPILER "@CMAKE_D_COMPILER@") +SET(CMAKE_D_COMPILER_ARG1 "@CMAKE_D_COMPILER_ARG1@") +SET(CMAKE_AR "@CMAKE_AR@") +SET(CMAKE_RANLIB "@CMAKE_RANLIB@") +SET(CMAKE_COMPILER_IS_GDC @CMAKE_COMPILER_IS_GDC@) +SET(CMAKE_COMPILER_IS_DMD @CMAKE_COMPILER_IS_DMD@) +SET(CMAKE_D_COMPILER_LOADED 1) +SET(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@) +SET(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@) +IF(CMAKE_COMPILER_IS_CYGWIN) + SET(CYGWIN 1) + SET(UNIX 1) +ENDIF(CMAKE_COMPILER_IS_CYGWIN) + +SET(CMAKE_D_COMPILER_ENV_VAR "DC") + +IF(CMAKE_COMPILER_IS_MINGW) + SET(MINGW 1) +ENDIF(CMAKE_COMPILER_IS_MINGW) +SET(CMAKE_COMPILER_IS_GDC_RUN 1) +SET(CMAKE_D_SOURCE_FILE_EXTENSIONS d) +SET(CMAKE_D_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) +SET(CMAKE_D_LINKER_PREFERENCE None) +IF(UNIX) + SET(CMAKE_D_OUTPUT_EXTENSION .o) +ELSE(UNIX) + SET(CMAKE_D_OUTPUT_EXTENSION .obj) +ENDIF(UNIX) +# save the size of void* in case where cache is removed +# and the this file is still around +#SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@) Property changes on: trunk/cmake/modules/CMakeDCompiler.cmake.in ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/cmake/modules/CMakeDInformation.cmake =================================================================== --- trunk/cmake/modules/CMakeDInformation.cmake (rev 0) +++ trunk/cmake/modules/CMakeDInformation.cmake 2009-03-09 22:05:41 UTC (rev 9692) @@ -0,0 +1,237 @@ +# +# CMakeD - CMake module for D Language +# +# Copyright (c) 2007, Selman Ulug <sel...@gm...> +# Tim Burrell <tim...@gm...> +# +# All rights reserved. +# +# See Copyright.txt for details. +# +# Modified from CMake 2.6.5 CMakeCInformation.cmake +# See http://www.cmake.org/HTML/Copyright.html for details +# + +# This file sets the basic flags for the D language in CMake. +# It also loads the available platform file for the system-compiler +# if it exists. + +GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_D_COMPILER} NAME_WE) +IF(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_BASE_NAME gdc) +ELSE(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_BASE_NAME dmd) +ENDIF(CMAKE_COMPILER_IS_GDC) +SET(CMAKE_SYSTEM_AND_D_COMPILER_INFO_FILE + ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) +INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) + +# This should be included before the _INIT variables are +# used to initialize the cache. Since the rule variables +# have if blocks on them, users can still define them here. +# But, it should still be after the platform file so changes can +# be made to those values. + +IF(CMAKE_USER_MAKE_RULES_OVERRIDE) + INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) +ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) + +IF(CMAKE_USER_MAKE_RULES_OVERRIDE_D) + INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_D}) +ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_D) + +# for most systems a module is the same as a shared library +# so unless the variable CMAKE_MODULE_EXISTS is set just +# copy the values from the LIBRARY variables +IF(NOT CMAKE_MODULE_EXISTS) + SET(CMAKE_SHARED_MODULE_D_FLAGS ${CMAKE_SHARED_LIBRARY_D_FLAGS}) + SET(CMAKE_SHARED_MODULE_CREATE_D_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS}) +ENDIF(NOT CMAKE_MODULE_EXISTS) + +SET (CMAKE_D_FLAGS "$ENV{CFLAGS} ${CMAKE_D_FLAGS_INIT}" CACHE STRING + "Flags for D compiler.") + +IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) +# default build type is none + IF(NOT CMAKE_NO_BUILD_TYPE) + SET (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING + "Choose the type of build, options are: None(CMAKE_D_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") + ENDIF(NOT CMAKE_NO_BUILD_TYPE) + SET (CMAKE_D_FLAGS_DEBUG "${CMAKE_D_FLAGS_DEBUG_INIT}" CACHE STRING + "Flags used by the compiler during debug builds.") + SET (CMAKE_D_FLAGS_MINSIZEREL "${CMAKE_D_FLAGS_MINSIZEREL_INIT}" CACHE STRING + "Flags used by the compiler during release minsize builds.") + SET (CMAKE_D_FLAGS_RELEASE "${CMAKE_D_FLAGS_RELEASE_INIT}" CACHE STRING + "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).") + SET (CMAKE_D_FLAGS_RELWITHDEBINFO "${CMAKE_D_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING + "Flags used by the compiler during Release with Debug Info builds.") +ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) + +IF(CMAKE_D_STANDARD_LIBRARIES_INIT) + SET(CMAKE_D_STANDARD_LIBRARIES "${CMAKE_D_STANDARD_LIBRARIES_INIT}" + CACHE STRING "Libraries linked by defalut with all D applications.") + MARK_AS_ADVANCED(CMAKE_D_STANDARD_LIBRARIES) +ENDIF(CMAKE_D_STANDARD_LIBRARIES_INIT) + +INCLUDE(CMakeCommonLanguageInclude) + +# now define the following rule variables + +# CMAKE_D_CREATE_SHARED_LIBRARY +# CMAKE_D_CREATE_SHARED_MODULE +# CMAKE_D_CREATE_STATIC_LIBRARY +# CMAKE_D_COMPILE_OBJECT +# CMAKE_D_LINK_EXECUTABLE + +# variables supplied by the generator at use time +# <TARGET> +# <TARGET_BASE> the target without the suffix +# <OBJECTS> +# <OBJECT> +# <LINK_LIBRARIES> +# <FLAGS> +# <LINK_FLAGS> + +# D compiler information +# <CMAKE_D_COMPILER> +# <CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS> +# <CMAKE_SHARED_MODULE_CREATE_D_FLAGS> +# <CMAKE_D_LINK_FLAGS> + +# Static library tools +# <CMAKE_AR> +# <CMAKE_RANLIB> + +IF("$ENV{D_PATH}" STREQUAL "") + STRING(LENGTH ${CMAKE_D_COMPILER} CMAKE_D_COMPILER_LENGTH) + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + MATH(EXPR CMAKE_D_COMPILER_LENGTH "${CMAKE_D_COMPILER_LENGTH} - 12") + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + MATH(EXPR CMAKE_D_COMPILER_LENGTH "${CMAKE_D_COMPILER_LENGTH} - 8") + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + STRING(SUBSTRING ${CMAKE_D_COMPILER} 0 ${CMAKE_D_COMPILER_LENGTH} D_PATH) +ELSE("$ENV{D_PATH}" STREQUAL "") + SET(D_PATH "$ENV{D_PATH}") +ENDIF("$ENV{D_PATH}" STREQUAL "") +MESSAGE(STATUS "D Compiler Install Prefix (use D_PATH env var to override): ${D_PATH}") + +IF(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_OUTPUT_D_FLAG "-o ") + SET(CMAKE_SHARED_LIBRARY_D_FLAGS "-fPIC") + SET(CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS "-shared") + SET(CMAKE_INCLUDE_FLAG_D "-I") # -I + SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty + SET(CMAKE_LIBRARY_PATH_FLAG "-L") + SET(CMAKE_LINK_LIBRARY_FLAG "-l") + SET(CMAKE_D_VERSION_FLAG "-fversion=") +ELSE(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_OUTPUT_D_FLAG "-of") + SET(CMAKE_D_VERSION_FLAG "-version=") + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + SET(CMAKE_INCLUDE_FLAG_D "-I") # -I + SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty + SET(CMAKE_LINK_LIBRARY_FLAG "-L+") + SET(CMAKE_LIBRARY_PATH_FLAG "-L+") + SET(CMAKE_LIBRARY_PATH_TERMINATOR "\\") + FIND_PROGRAM(DMD_LIBRARIAN "lib.exe") + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + SET(CMAKE_SHARED_LIBRARY_D_FLAGS "-fPIC") + SET(CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS "-shared") + SET(CMAKE_INCLUDE_FLAG_D "-I") # -I + SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty + SET(CMAKE_LIBRARY_PATH_FLAG "-L") + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") +ENDIF(CMAKE_COMPILER_IS_GDC) + +IF(CMAKE_D_USE_TANGO) + IF(CMAKE_COMPILER_IS_GDC) + SET(DSTDLIB_TYPE "-fversion=Tango") + SET(DSTDLIB_FLAGS "-lgtango") + ELSE(CMAKE_COMPILER_IS_GDC) + SET(DSTDLIB_TYPE "-version=Tango") + SET(DSTDLIB_FLAGS "-L${D_PATH}/lib -ltango -lphobos") + ENDIF(CMAKE_COMPILER_IS_GDC) +ENDIF(CMAKE_D_USE_TANGO) +IF(CMAKE_D_USE_PHOBOS) + IF(CMAKE_COMPILER_IS_GDC) + SET(DSTDLIB_TYPE "-fversion=Phobos") + SET(DSTDLIB_FLAGS "-lgphobos") + ELSE(CMAKE_COMPILER_IS_GDC) + SET(DSTDLIB_TYPE "-version=Phobos") + SET(DSTDLIB_FLAGS "-L${D_PATH}/lib -lphobos") + ENDIF(CMAKE_COMPILER_IS_GDC) +ENDIF(CMAKE_D_USE_PHOBOS) + +# create a D shared library +IF(NOT CMAKE_D_CREATE_SHARED_LIBRARY) + IF(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_D_CREATE_SHARED_LIBRARY + "<CMAKE_D_COMPILER> <CMAKE_SHARED_LIBRARY_D_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_D_FLAG><TARGET_SONAME> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <OBJECTS> <LINK_LIBRARIES>") + ELSE(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_D_CREATE_SHARED_LIBRARY + "<CMAKE_D_COMPILER> <CMAKE_SHARED_LIBRARY_D_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_D_FLAG><TARGET_SONAME> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <OBJECTS> <LINK_LIBRARIES> ${DSTDLIB_FLAGS}") + ENDIF(CMAKE_COMPILER_IS_GDC) +ENDIF(NOT CMAKE_D_CREATE_SHARED_LIBRARY) + +# create a D shared module just copy the shared library rule +IF(NOT CMAKE_D_CREATE_SHARED_MODULE) + SET(CMAKE_D_CREATE_SHARED_MODULE ${CMAKE_D_CREATE_SHARED_LIBRARY}) +ENDIF(NOT CMAKE_D_CREATE_SHARED_MODULE) + +# create a D static library +IF(NOT CMAKE_D_CREATE_STATIC_LIBRARY) + IF(CMAKE_COMPILER_IS_GDC) + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + SET(CMAKE_D_CREATE_STATIC_LIBRARY + "<CMAKE_AR> cr <TARGET>.lib <LINK_FLAGS> <OBJECTS> " + "<CMAKE_RANLIB> <TARGET>.lib " + "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> " + "<CMAKE_RANLIB> <TARGET> " + ) + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + SET(CMAKE_D_CREATE_STATIC_LIBRARY + "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> " + "<CMAKE_RANLIB> <TARGET> " + ) + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + ELSE(CMAKE_COMPILER_IS_GDC) + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + SET(CMAKE_D_CREATE_STATIC_LIBRARY + "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>" + "<CMAKE_RANLIB> <TARGET>") + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + SET(CMAKE_D_CREATE_STATIC_LIBRARY + "${DMD_LIBRARIAN} -c -p256 <TARGET> <OBJECTS>") + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + ENDIF(CMAKE_COMPILER_IS_GDC) +ENDIF(NOT CMAKE_D_CREATE_STATIC_LIBRARY) + +# compile a D file into an object file +IF(NOT CMAKE_D_COMPILE_OBJECT) + SET(CMAKE_D_COMPILE_OBJECT + "<CMAKE_D_COMPILER> <FLAGS> ${CMAKE_OUTPUT_D_FLAG}<OBJECT> -c <SOURCE>") +ENDIF(NOT CMAKE_D_COMPILE_OBJECT) + +IF(NOT CMAKE_D_LINK_EXECUTABLE) + IF(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_D_LINK_EXECUTABLE + "<CMAKE_D_COMPILER> <FLAGS> <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <LINK_LIBRARIES> ${DSTDLIB_FLAGS} ${DSTDLIB_TYPE}") + ELSE(CMAKE_COMPILER_IS_GDC) + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + SET(CMAKE_D_LINK_EXECUTABLE + "gcc ${DLINK_FLAGS} <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -lpthread -lm ${DSTDLIB_FLAGS}") + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + SET(CMAKE_D_LINK_EXECUTABLE + "<CMAKE_D_COMPILER> <FLAGS> <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <LINK_LIBRARIES>") + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + ENDIF(CMAKE_COMPILER_IS_GDC) +ENDIF(NOT CMAKE_D_LINK_EXECUTABLE) + +MARK_AS_ADVANCED( +CMAKE_D_FLAGS +CMAKE_D_FLAGS_DEBUG +CMAKE_D_FLAGS_MINSIZEREL +CMAKE_D_FLAGS_RELEASE +CMAKE_D_FLAGS_RELWITHDEBINFO +) +SET(CMAKE_D_INFORMATION_LOADED 1) Property changes on: trunk/cmake/modules/CMakeDInformation.cmake ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: trunk/cmake/modules/CMakeDetermineDCompiler.cmake =================================================================== --- trunk/cmake/modules/CMakeDetermineDCompiler.cmake (rev 0) +++ trunk/cmake/modules/CMakeDetermineDCompiler.cmake 2009-03-09 22:05:41 UTC (rev 9692) @@ -0,0 +1,108 @@ +# +# CMakeD - CMake module for D Language +# +# Copyright (c) 2007, Selman Ulug <sel...@gm...> +# Tim Burrell <tim...@gm...> +# +# All rights reserved. +# +# See Copyright.txt for details. +# +# Modified from CMake 2.6.5 CMakeDetermineCCompiler.cmake +# See http://www.cmake.org/HTML/Copyright.html for details +# + +# determine the compiler to use for D programs +# NOTE, a generator may set CMAKE_D_COMPILER before +# loading this file to force a compiler. +# use environment variable DC first if defined by user, next use +# the cmake variable CMAKE_GENERATOR_D which can be defined by a generator +# as a default compiler + +IF(NOT CMAKE_D_COMPILER) + + # prefer the environment variable DC + IF($ENV{DC} MATCHES ".+") + GET_FILENAME_COMPONENT(CMAKE_D_COMPILER_INIT $ENV{DC} PROGRAM PROGRAM_ARGS CMAKE_D_FLAGS_ENV_INIT) + IF(CMAKE_D_FLAGS_ENV_INIT) + SET(CMAKE_D_COMPILER_ARG1 "${CMAKE_D_FLAGS_ENV_INIT}" CACHE STRING "First argument to D compiler") + ENDIF(CMAKE_D_FLAGS_ENV_INIT) + IF(EXISTS ${CMAKE_D_COMPILER_INIT}) + ELSE(EXISTS ${CMAKE_D_COMPILER_INIT}) + MESSAGE(FATAL_ERROR "Could not find compiler set in environment variable C:\n$ENV{DC}.") + ENDIF(EXISTS ${CMAKE_D_COMPILER_INIT}) + ENDIF($ENV{DC} MATCHES ".+") + + # next try prefer the compiler specified by the generator + IF(CMAKE_GENERATOR_D) + IF(NOT CMAKE_D_COMPILER_INIT) + SET(CMAKE_D_COMPILER_INIT ${CMAKE_GENERATOR_D}) + ENDIF(NOT CMAKE_D_COMPILER_INIT) + ENDIF(CMAKE_GENERATOR_D) + + # finally list compilers to try + IF(CMAKE_D_COMPILER_INIT) + SET(CMAKE_D_COMPILER_LIST ${CMAKE_D_COMPILER_INIT}) + ELSE(CMAKE_D_COMPILER_INIT) + SET(CMAKE_D_COMPILER_LIST gdc dmd) + ENDIF(CMAKE_D_COMPILER_INIT) + + # Find the compiler. + FIND_PROGRAM(CMAKE_D_COMPILER NAMES ${CMAKE_D_COMPILER_LIST} DOC "C compiler") + IF(CMAKE_D_COMPILER_INIT AND NOT CMAKE_D_COMPILER) + SET(CMAKE_D_COMPILER "${CMAKE_D_COMPILER_INIT}" CACHE FILEPATH "C compiler" FORCE) + ENDIF(CMAKE_D_COMPILER_INIT AND NOT CMAKE_D_COMPILER) +ENDIF(NOT CMAKE_D_COMPILER) +MARK_AS_ADVANCED(CMAKE_D_COMPILER) +GET_FILENAME_COMPONENT(COMPILER_LOCATION "${CMAKE_D_COMPILER}" PATH) + +FIND_PROGRAM(CMAKE_AR NAMES ar PATHS ${COMPILER_LOCATION} ) + +FIND_PROGRAM(CMAKE_RANLIB NAMES ranlib) +IF(NOT CMAKE_RANLIB) + SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib") +ENDIF(NOT CMAKE_RANLIB) +MARK_AS_ADVANCED(CMAKE_RANLIB) + +# do not test for GNU if the generator is visual studio +IF(${CMAKE_GENERATOR} MATCHES "Visual Studio") + SET(CMAKE_COMPILER_IS_GDC_RUN 1) +ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio") + + +IF(NOT CMAKE_COMPILER_IS_GDC_RUN) + # test to see if the d compiler is gdc + SET(CMAKE_COMPILER_IS_GDC_RUN 1) + IF("${CMAKE_D_COMPILER}" MATCHES ".*gdc.*" ) + SET(CMAKE_COMPILER_IS_GDC 1) + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if the D compiler is GDC succeeded with " + "the following output:\n${CMAKE_D_COMPILER}\n\n") + EXEC_PROGRAM(${CMAKE_D_COMPILER} ARGS "--version" OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT) + IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*mingw.*" ) + SET(CMAKE_COMPILER_IS_MINGW 1) + ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*mingw.*" ) + IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_CYGWIN.*" ) + SET(CMAKE_COMPILER_IS_CYGWIN 1) + ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_CYGWIN.*" ) + ELSE("${CMAKE_D_COMPILER}" MATCHES ".*dmd.*" ) + SET(CMAKE_COMPILER_IS_DMD 1) + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if the D compiler is DMD succeeded with " + "the following output:\n${CMAKE_D_COMPILER}\n\n") + ENDIF("${CMAKE_D_COMPILER}" MATCHES ".*gdc.*" ) +ENDIF(NOT CMAKE_COMPILER_IS_GDC_RUN) + + +# configure variables set in this file for fast reload later on +IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in + "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE) +ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) + CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in + "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE) +ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) + +MARK_AS_ADVANCED(CMAKE_AR) +SET(CMAKE_D_COMPILER_ENV_VAR "DC") + Property changes on: trunk/cmake/modules/CMakeDetermineDCompiler.cmake ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/cmake/modules/CMakeTestDCompiler.cmake =================================================================== --- trunk/cmake/modules/CMakeTestDCompiler.cmake (rev 0) +++ trunk/cmake/modules/CMakeTestDCompiler.cmake 2009-03-09 22:05:41 UTC (rev 9692) @@ -0,0 +1,175 @@ +# +# CMakeD - CMake module for D Language +# +# Copyright (c) 2007, Selman Ulug <sel...@gm...> +# Tim Burrell <tim...@gm...> +# +# All rights reserved. +# +# See Copyright.txt for details. +# +# Modified from CMake 2.6.5 CMakeTestCCompiler.cmake +# See http://www.cmake.org/HTML/Copyright.html for details +# + +# This file is used by EnableLanguage in cmGlobalGenerator to +# determine that that selected D compiler can actually compile +# and link the most basic of programs. If not, a fatal error +# is set and cmake stops processing commands and will not generate +# any makefiles or projects. + +IF(NOT CMAKE_D_COMPILER_WORKS) + MESSAGE(STATUS "Check for working D compiler: ${CMAKE_D_COMPILER}") + FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + "int main(char[][] args)\n" + "{return args.sizeof-1;}\n") + STRING(REGEX MATCH "dmd" DMDTEST "${CMAKE_D_COMPILER}") + IF(DMDTEST STREQUAL "dmd") + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + OUTPUT_VARIABLE OUTPUT) + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a" + OUTPUT_VARIABLE OUTPUT) + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + ELSE(DMDTEST STREQUAL "dmd") + TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + OUTPUT_VARIABLE OUTPUT) + ENDIF(DMDTEST STREQUAL "dmd") + SET(C_TEST_WAS_RUN 1) +ENDIF(NOT CMAKE_D_COMPILER_WORKS) + +IF(NOT CMAKE_D_COMPILER_WORKS) + MESSAGE(STATUS "Check for working D compiler: ${CMAKE_D_COMPILER} -- broken") + message(STATUS "To force a specific D compiler set the DC environment variable") + message(STATUS " ie - export DC=\"/opt/dmd/bin/dmd\"") + message(STATUS "If the D path is not set please use the D_PATH variable") + message(STATUS " ie - export D_PATH=\"/opt/dmd\"") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if the D compiler works failed with " + "the following output:\n${OUTPUT}\n\n") + MESSAGE(FATAL_ERROR "The D compiler \"${CMAKE_D_COMPILER}\" " + "is not able to compile a simple test program.\nIt fails " + "with the following output:\n ${OUTPUT}\n\n" + "CMake will not be able to correctly generate this project.") +ELSE(NOT CMAKE_D_COMPILER_WORKS) + IF(C_TEST_WAS_RUN) + MESSAGE(STATUS "Check for working D compiler: ${CMAKE_D_COMPILER} -- works") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if the D compiler works passed with " + "the following output:\n${OUTPUT}\n\n") + ENDIF(C_TEST_WAS_RUN) + SET(CMAKE_D_COMPILER_WORKS 1 CACHE INTERNAL "") + # re-configure this file CMakeDCompiler.cmake so that it gets + # the value for CMAKE_SIZEOF_VOID_P + # configure variables set in this file for fast reload later on + IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE) + ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) + CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE) + ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) +ENDIF(NOT CMAKE_D_COMPILER_WORKS) + +IF(NOT CMAKE_D_PHOBOS_WORKS) + MESSAGE(STATUS "Check for working Phobos") + FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + "import std.stdio;\n" + "int main(char[][] args)\n" + "{ writefln(\"%s\", args[0]); return args.sizeof-1;}\n") + IF(CMAKE_COMPILER_IS_GDC) + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + #CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos" + OUTPUT_VARIABLE OUTPUT) + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos" + OUTPUT_VARIABLE OUTPUT) + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + ELSE(CMAKE_COMPILER_IS_GDC) + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + OUTPUT_VARIABLE OUTPUT) + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a" + COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import" + OUTPUT_VARIABLE OUTPUT) + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + ENDIF(CMAKE_COMPILER_IS_GDC) + SET(C_TEST_WAS_RUN 1) +ENDIF(NOT CMAKE_D_PHOBOS_WORKS) + +IF(NOT CMAKE_D_PHOBOS_WORKS) + MESSAGE(STATUS "Check for working Phobos -- unavailable") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if Phobos works failed with " + "the following output:\n${OUTPUT}\n\n") + #MESSAGE(FATAL_ERROR "Phobos does not work") +ELSE(NOT CMAKE_D_PHOBOS_WORKS) + IF(C_TEST_WAS_RUN) + MESSAGE(STATUS "Check for working Phobos -- works") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if Phobos works passed with " + "the following output:\n${OUTPUT}\n\n") + ENDIF(C_TEST_WAS_RUN) + SET(CMAKE_D_PHOBOS_WORKS 1 CACHE INTERNAL "") +ENDIF(NOT CMAKE_D_PHOBOS_WORKS) + +IF(NOT CMAKE_D_TANGO_WORKS) + MESSAGE(STATUS "Check for working Tango") + FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + "import tango.io.Stdout;" + "int main(char[][] args)\n" + "{Stdout.newline();return args.sizeof-1;}\n") + IF(CMAKE_COMPILER_IS_GDC) + TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + CMAKE_FLAGS "-DLINK_LIBRARIES=gtango" + OUTPUT_VARIABLE OUTPUT) + ELSE(CMAKE_COMPILER_IS_GDC) + IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + OUTPUT_VARIABLE OUTPUT) + ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d + CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a" + COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import" + OUTPUT_VARIABLE OUTPUT) + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + ENDIF(CMAKE_COMPILER_IS_GDC) + SET(C_TEST_WAS_RUN 1) +ENDIF(NOT CMAKE_D_TANGO_WORKS) + +IF(NOT CMAKE_D_TANGO_WORKS) + MESSAGE(STATUS "Check for working Tango -- unavailable") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Determining if Tango works failed with " + "the following output:\n${OUTPUT}\n\n") + #MESSAGE(FATAL_ERROR "Tango does not work: \n${OUTPUT}\n\n") +ELSE(NOT CMAKE_D_TANGO_WORKS) + IF(C_TEST_WAS_RUN) + MESSAGE(STATUS "Check for working Tango -- works") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Determining if Tango works passed with " + "the following output:\n${OUTPUT}\n\n") + ENDIF(C_TEST_WAS_RUN) + SET(CMAKE_D_TANGO_WORKS 1 CACHE INTERNAL "") +ENDIF(NOT CMAKE_D_TANGO_WORKS) + +# if both tango and phobos are selected try to choose which one is available +IF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS) + MESSAGE(FATAL_ERROR "Tango AND Phobos selected, please choose one or the other!") +ENDIF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS) + +# ensure the user has the appropriate std lib available +IF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS) + MESSAGE(FATAL_ERROR "Tango is required for this project, but it is not available!") +ENDIF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS) + +IF(CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_PHOBOS_WORKS) + MESSAGE(FATAL_ERROR "Phobos is required for this project, but it is not available!") +ENDIF(CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_PHOBOS_WORKS) + Property changes on: trunk/cmake/modules/CMakeTestDCompiler.cmake ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-03-09 22:09:50
|
Revision: 9693 http://plplot.svn.sourceforge.net/plplot/?rev=9693&view=rev Author: smekal Date: 2009-03-09 22:09:38 +0000 (Mon, 09 Mar 2009) Log Message: ----------- CMake tries now to determine which D compiler (gdc, dmd) is available using CMakeD and disables D bindings if none is found. D bindings are still off by default. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Added Paths: ----------- trunk/cmake/modules/d.cmake Added: trunk/cmake/modules/d.cmake =================================================================== --- trunk/cmake/modules/d.cmake (rev 0) +++ trunk/cmake/modules/d.cmake 2009-03-09 22:09:38 UTC (rev 9693) @@ -0,0 +1,45 @@ +# cmake/modules/d.cmake +# +# D binding configuration +# +# Copyright (C) 2008 Werner Smekal +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with the file PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# Module for determining D bindings configuration options + +# Options to enable D bindings +if(DEFAULT_NO_BINDINGS) + option(ENABLE_d "Enable D bindings" OFF) +else(DEFAULT_NO_BINDINGS) + option(ENABLE_d "Enable D bindings" OFF) +endif(DEFAULT_NO_BINDINGS) + +if(ENABLE_d) + # Check for gdc or dmd compiler + include(CMakeDetermineDCompiler) + if(NOT CMAKE_D_COMPILER) + message(STATUS "WARNING: " + "D compiler not found. Disabling D bindings" + ) + set(ENABLE_d OFF CACHE BOOL "Enable D bindings" FORCE) + endif(NOT CMAKE_D_COMPILER) +endif(ENABLE_d) + +if(ENABLE_d) + # Enable D language + enable_language(D) +endif(ENABLE_d) Property changes on: trunk/cmake/modules/d.cmake ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-03-09 22:05:41 UTC (rev 9692) +++ trunk/cmake/modules/plplot.cmake 2009-03-09 22:09:38 UTC (rev 9693) @@ -388,6 +388,7 @@ include(ada) include(ocaml) include(lua) +include(d) # ======================================================================= # additional library support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-03-16 15:26:12
|
Revision: 9746 http://plplot.svn.sourceforge.net/plplot/?rev=9746&view=rev Author: smekal Date: 2009-03-16 15:25:43 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Only check for broken cmath with isnan missing if compiler is not a Visual C++ compiler. Corrected wrong name in comment. Modified Paths: -------------- trunk/cmake/modules/TestBrokenIsnanCXX.cmake trunk/cmake/modules/c++.cmake Modified: trunk/cmake/modules/TestBrokenIsnanCXX.cmake =================================================================== --- trunk/cmake/modules/TestBrokenIsnanCXX.cmake 2009-03-16 15:24:07 UTC (rev 9745) +++ trunk/cmake/modules/TestBrokenIsnanCXX.cmake 2009-03-16 15:25:43 UTC (rev 9746) @@ -1,4 +1,4 @@ -# cmake/modules/TestForNamespace.cmake +# cmake/modules/TestBrokenIsnanCXX.cmake # # C++ binding configuration # Modified: trunk/cmake/modules/c++.cmake =================================================================== --- trunk/cmake/modules/c++.cmake 2009-03-16 15:24:07 UTC (rev 9745) +++ trunk/cmake/modules/c++.cmake 2009-03-16 15:25:43 UTC (rev 9746) @@ -39,8 +39,11 @@ INCLUDE(CheckIncludeFileCXX) CHECK_INCLUDE_FILE_CXX(cmath HAVE_CMATH) -# Need to add check for broken cmath with isnan missing (BROKEN_ISNAN_CXX) -INCLUDE(TestBrokenIsnanCXX) +if(NOT MSVC) + # Need to add check for broken cmath with isnan missing (BROKEN_ISNAN_CXX) + # but not for Visual C++ compilers + include(TestBrokenIsnanCXX) +endif(NOT MSVC) # Need to add check if stdint.h can be used from c++ (HAVE_CXX_STDINT_H) INCLUDE(TestForStdintCXX) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-03-19 15:45:51
|
Revision: 9758 http://plplot.svn.sourceforge.net/plplot/?rev=9758&view=rev Author: airwin Date: 2009-03-19 15:45:21 +0000 (Thu, 19 Mar 2009) Log Message: ----------- Replace blank with underscore in file name to simplify Unix user's lives. Added Paths: ----------- trunk/cmake/modules/CMakeD_Copyright.txt Removed Paths: ------------- trunk/cmake/modules/CMakeD Copyright.txt Deleted: trunk/cmake/modules/CMakeD Copyright.txt =================================================================== --- trunk/cmake/modules/CMakeD Copyright.txt 2009-03-19 12:10:17 UTC (rev 9757) +++ trunk/cmake/modules/CMakeD Copyright.txt 2009-03-19 15:45:21 UTC (rev 9758) @@ -1,30 +0,0 @@ -CMakeD - CMake module for D Language - -Copyright (c) 2007, Selman Ulug <sel...@gm...> - Tim Burrell <tim...@gm...> - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copied: trunk/cmake/modules/CMakeD_Copyright.txt (from rev 9757, trunk/cmake/modules/CMakeD Copyright.txt) =================================================================== --- trunk/cmake/modules/CMakeD_Copyright.txt (rev 0) +++ trunk/cmake/modules/CMakeD_Copyright.txt 2009-03-19 15:45:21 UTC (rev 9758) @@ -0,0 +1,30 @@ +CMakeD - CMake module for D Language + +Copyright (c) 2007, Selman Ulug <sel...@gm...> + Tim Burrell <tim...@gm...> + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Property changes on: trunk/cmake/modules/CMakeD_Copyright.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2009-04-04 21:23:57
|
Revision: 9789 http://plplot.svn.sourceforge.net/plplot/?rev=9789&view=rev Author: hbabcock Date: 2009-04-04 21:23:44 +0000 (Sat, 04 Apr 2009) Log Message: ----------- Changed the pkg_check_pkgconfig macro to also return the library version. Changed cairo.cmake to check this version and print a warning about text clipping speed for older versions. Updated the pkg_check_pkgconfig macro in the other drivers .cmake files. Modified Paths: -------------- trunk/cmake/modules/FindAGG.cmake trunk/cmake/modules/cairo.cmake trunk/cmake/modules/gcw.cmake trunk/cmake/modules/pango.cmake trunk/cmake/modules/pkg-config.cmake trunk/cmake/modules/psttf.cmake Modified: trunk/cmake/modules/FindAGG.cmake =================================================================== --- trunk/cmake/modules/FindAGG.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/FindAGG.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -10,7 +10,7 @@ if(PKG_CONFIG_EXECUTABLE) # Use pkg-config (if available) to provide location of AGG headers and # libraries and also provide basis for defining AGG_DEFINITIONS. - pkg_check_pkgconfig(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags _AGG) + pkg_check_pkgconfig(libagg _AGGIncDir _AGGLinkDir _AGGLinkFlags _AGGCflags _AGGVersion _AGG) #message(STATUS "_AGGIncDir = ${_AGGIncDir}") #message(STATUS "_AGGLinkDir = ${_AGGLinkDir}") #message(STATUS "_AGGLinkFlags = ${_AGGLinkFlags}") Modified: trunk/cmake/modules/cairo.cmake =================================================================== --- trunk/cmake/modules/cairo.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/cairo.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -93,9 +93,18 @@ linkdir linkflags cflags + version _CAIRO ) if(linkflags) + # Check that the pangocairo library version is recent + # enough to efficiently handle text clipping. + # If it is not then we print a warning. + transform_version(NUMERICAL_PANGOCAIRO_MINIMUM_VERSION "1.20.5") + transform_version(NUMERICAL_PANGOCAIRO_VERSION "${version}") + if(NUMERICAL_PANGOCAIRO_VERSION LESS "${NUMERICAL_PANGOCAIRO_MINIMUM_VERSION}") + message("Pango Cairo version (${version}) < 1.20.5, if text rendering is slow recommend turning off text clipping") + endif(NUMERICAL_PANGOCAIRO_VERSION LESS "${NUMERICAL_PANGOCAIRO_MINIMUM_VERSION}") set(cairo_RPATH ${linkdir}) if(PLD_xcairo AND X11_COMPILE_FLAGS) # Blank-delimited required. Modified: trunk/cmake/modules/gcw.cmake =================================================================== --- trunk/cmake/modules/gcw.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/gcw.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -48,9 +48,9 @@ # there is a question whether all that ton of extra potentially interfering # libraries might be causing a segfault that is observed for the # dynamic devices case. -# pkg_check_pkgconfig(libgnomeui-2.0 includedir libdir linkflags cflags _GCW1) +# pkg_check_pkgconfig(libgnomeui-2.0 includedir libdir linkflags cflags version _GCW1) # if(linkflags) - pkg_check_pkgconfig(libgnomeprintui-2.2 includedir libdir linkflags1 cflags1 _GCW2) + pkg_check_pkgconfig(libgnomeprintui-2.2 includedir libdir linkflags1 cflags1 version1 _GCW2) if(linkflags1) # Requires blank-delimited list. string(REGEX REPLACE ";" " " gcw_COMPILE_FLAGS "${cflags1}") @@ -79,7 +79,7 @@ if(PLD_gcw) # Check for gthread-2.0 done in cf/gcw.ac, but result not actually used # anywhere in the autotools configuration so we comment it out here. -# pkg_check_pkgconfig(gthread-2.0 includedir libdir linkflags cflags _GCW3) +# pkg_check_pkgconfig(gthread-2.0 includedir libdir linkflags cflags version _GCW3) set(include_files_to_check "math.h" "glib.h" Modified: trunk/cmake/modules/pango.cmake =================================================================== --- trunk/cmake/modules/pango.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/pango.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -22,7 +22,7 @@ if(PKG_CONFIG_EXECUTABLE) pkg_check_pkgconfig( pango - PANGO_INCLUDE_DIR PANGO_LINK_DIR PANGO_LINK_FLAGS PANGO_CFLAGS _PANGO1 + PANGO_INCLUDE_DIR PANGO_LINK_DIR PANGO_LINK_FLAGS PANGO_CFLAGS PANGO_VERSION _PANGO1 ) if(NOT PANGO_LINK_FLAGS) message(STATUS @@ -32,7 +32,7 @@ pkg_check_pkgconfig( pangoft2 - PANGOFT2_INCLUDE_DIR PANGOFT2_LINK_DIR PANGOFT2_LINK_FLAGS PANGOFT2_CFLAGS _PANGO2 + PANGOFT2_INCLUDE_DIR PANGOFT2_LINK_DIR PANGOFT2_LINK_FLAGS PANGOFT2_CFLAGS PANGOFT2_VERSION _PANGO2 ) if(NOT PANGOFT2_LINK_FLAGS) message(STATUS Modified: trunk/cmake/modules/pkg-config.cmake =================================================================== --- trunk/cmake/modules/pkg-config.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/pkg-config.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -59,7 +59,7 @@ set(pkg_config_true "#") endif(PKG_CONFIG_EXECUTABLE) -macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags) +macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _version) # Similar to legacy pkgconfig only these results are derived # from pkg_check_modules and therefore are returned as lists rather than # blank-delimited strings. Also, the _link_FLAGS value is converted @@ -79,12 +79,14 @@ set(${_link_DIR} ${${_prefix}_LIBRARY_DIRS}) cmake_link_flags(${_link_FLAGS} "${${_prefix}_LDFLAGS}") set(${_cflags} ${${_prefix}_CFLAGS}) + set(${_version} ${${_prefix}_VERSION}) set(_return_VALUE 0) else(${_prefix}_FOUND) set(${_include_DIR}) set(${_link_DIR}) set(${_link_FLAGS}) set(${_cflags}) + set(${_version}) set(_return_VALUE 1) endif(${_prefix}_FOUND) #message("${_prefix}_FOUND = ${${_prefix}_FOUND}") @@ -223,3 +225,4 @@ #message("${_link_flags_out} = ${${_link_flags_out}}") endif("${_link_flags_in}" STREQUAL "") endmacro(cmake_link_flags) + Modified: trunk/cmake/modules/psttf.cmake =================================================================== --- trunk/cmake/modules/psttf.cmake 2009-04-03 13:12:50 UTC (rev 9788) +++ trunk/cmake/modules/psttf.cmake 2009-04-04 21:23:44 UTC (rev 9789) @@ -47,7 +47,7 @@ endif(PLD_psttf) if(PLD_psttf) - pkg_check_pkgconfig("lasi;pango;pangoft2" includedir libdir linkflags cflags _PSTTF) + pkg_check_pkgconfig("lasi;pango;pangoft2" includedir libdir linkflags cflags version _PSTTF) if(linkflags) #blank-separated required. string(REGEX REPLACE ";" " " psttf_COMPILE_FLAGS "${cflags}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-01 18:14:46
|
Revision: 9870 http://plplot.svn.sourceforge.net/plplot/?rev=9870&view=rev Author: airwin Date: 2009-05-01 18:14:43 +0000 (Fri, 01 May 2009) Log Message: ----------- Replace ${CMAKE_SOURCE_DIR}/cmake/Modules (which does not exist for PLplot since we use "cmake/modules" instead of "cmake/Modules" ) with more generic ${CMAKE_MODULE_PATH} which works well. Thanks to Orion Poplawski for reporting the problem and also giving the fix. Modified Paths: -------------- trunk/cmake/modules/CMakeDetermineDCompiler.cmake trunk/cmake/modules/CMakeTestDCompiler.cmake Modified: trunk/cmake/modules/CMakeDetermineDCompiler.cmake =================================================================== --- trunk/cmake/modules/CMakeDetermineDCompiler.cmake 2009-05-01 15:11:49 UTC (rev 9869) +++ trunk/cmake/modules/CMakeDetermineDCompiler.cmake 2009-05-01 18:14:43 UTC (rev 9870) @@ -95,13 +95,13 @@ # configure variables set in this file for fast reload later on -IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in +IF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in) + CONFIGURE_FILE(${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE) -ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) +ELSE(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE) -ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) +ENDIF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in) MARK_AS_ADVANCED(CMAKE_AR) SET(CMAKE_D_COMPILER_ENV_VAR "DC") Modified: trunk/cmake/modules/CMakeTestDCompiler.cmake =================================================================== --- trunk/cmake/modules/CMakeTestDCompiler.cmake 2009-05-01 15:11:49 UTC (rev 9869) +++ trunk/cmake/modules/CMakeTestDCompiler.cmake 2009-05-01 18:14:43 UTC (rev 9870) @@ -64,13 +64,13 @@ # re-configure this file CMakeDCompiler.cmake so that it gets # the value for CMAKE_SIZEOF_VOID_P # configure variables set in this file for fast reload later on - IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in + IF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in) + CONFIGURE_FILE(${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE) - ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) + ELSE(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE) - ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in) + ENDIF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in) ENDIF(NOT CMAKE_D_COMPILER_WORKS) IF(NOT CMAKE_D_PHOBOS_WORKS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |