From: <and...@us...> - 2009-02-24 10:07:01
|
Revision: 9600 http://plplot.svn.sourceforge.net/plplot/?rev=9600&view=rev Author: andrewross Date: 2009-02-24 10:06:57 +0000 (Tue, 24 Feb 2009) Log Message: ----------- Fix typo in last commit for cmake checks for finite / _finite. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-02-24 08:51:03 UTC (rev 9599) +++ trunk/cmake/modules/plplot.cmake 2009-02-24 10:06:57 UTC (rev 9600) @@ -191,7 +191,7 @@ # are sometimes all that is available on windows check_symbol_exists(finite "math.h" HAVE_FINITE) if(NOT HAVE_FINITE) - check_symbolnction_exists(_finite "math.h" _HAVE_FINITE) + check_symbol_exists(_finite "math.h" _HAVE_FINITE) set(HAVE_FINITE ${_HAVE_FINITE} CACHE INTERNAL "Have function _finite") endif(NOT HAVE_FINITE) check_symbol_exists(isnan "math.h" HAVE_ISNAN) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-02-25 12:48:06
|
Revision: 9607 http://plplot.svn.sourceforge.net/plplot/?rev=9607&view=rev Author: smekal Date: 2009-02-25 12:46:00 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Change the logic to find isnan, ising and finite so that Visual C++ also works: First it tries to find the symbol isnan. Then the function isnan. Then symbol _isnan. Then function _isnan. Same for isinf and finite. Still fast for GCC compilers, since the functions are found with the first check, while Visual C++ goes through all checks. Note, that I had to use HAVE_FINITE2 and similar since you are not allowed to change e.g. HAVE_FINITE if this variable was used in the IF clause. Adding else some DevPack packaging stuff, which is Win32 only. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-02-25 05:10:23 UTC (rev 9606) +++ trunk/cmake/modules/plplot.cmake 2009-02-25 12:46:00 UTC (rev 9607) @@ -88,6 +88,18 @@ ) endif(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") +# create a devpackage file +option(DEVPAK "Create DevPackage" NO) +if(DEVPAK AND NOT WIN32) + message( STATUS "DevPackage only available for Win32. Set DEVPAK to OFF." ) + set(DEVPAK OFF) +endif(DEVPAK AND NOT WIN32) +if(DEVPAK AND BUILD_TEST) + message( STATUS "Examples are not build for DevPackage. Set BUILD_TEST to OFF." ) + set(BUILD_TEST OFF) +endif(DEVPAK AND BUILD_TEST) + + # ======================================================================= # Headers # ======================================================================= @@ -191,17 +203,43 @@ # are sometimes all that is available on windows check_symbol_exists(finite "math.h" HAVE_FINITE) if(NOT HAVE_FINITE) + check_function_exists(finite HAVE_FINITE2) +endif(NOT HAVE_FINITE) +set(HAVE_FINITE ${HAVE_FINITE2}) +if(NOT HAVE_FINITE) check_symbol_exists(_finite "math.h" _HAVE_FINITE) + if(NOT _HAVE_FINITE) + check_function_exists(_finite _HAVE_FINITE2) + endif(NOT _HAVE_FINITE) + set(_HAVE_FINITE ${_HAVE_FINITE2}) set(HAVE_FINITE ${_HAVE_FINITE} CACHE INTERNAL "Have function _finite") endif(NOT HAVE_FINITE) + check_symbol_exists(isnan "math.h" HAVE_ISNAN) if(NOT HAVE_ISNAN) + check_function_exists(isnan HAVE_ISNAN2) +endif(NOT HAVE_ISNAN) +set(HAVE_ISNAN ${HAVE_ISNAN2}) +if(NOT HAVE_ISNAN) check_symbol_exists(_isnan "math.h" _HAVE_ISNAN) + if(NOT _HAVE_ISNAN) + check_function_exists(_isnan _HAVE_ISNAN2) + endif(NOT _HAVE_ISNAN) + set(_HAVE_ISNAN ${_HAVE_ISNAN2}) set(HAVE_ISNAN ${_HAVE_ISNAN} CACHE INTERNAL "Have function _isnan") endif(NOT HAVE_ISNAN) + check_symbol_exists(isinf "math.h" HAVE_ISINF) if(NOT HAVE_ISINF) + check_function_exists(isinf HAVE_ISINF2) +endif(NOT HAVE_ISINF) +set(HAVE_ISINF ${HAVE_ISINF2}) +if(NOT HAVE_ISINF) check_symbol_exists(_isinf "math.h" _HAVE_ISINF) + if(NOT _HAVE_ISINF) + check_function_exists(_isinf _HAVE_ISINF2) + endif(NOT _HAVE_ISINF) + set(_HAVE_ISINF ${_HAVE_ISINF2}) set(HAVE_ISINF ${_HAVE_ISINF} CACHE INTERNAL "Have function _isinf") endif(NOT HAVE_ISINF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-26 23:07:39
|
Revision: 10179 http://plplot.svn.sourceforge.net/plplot/?rev=10179&view=rev Author: airwin Date: 2009-07-26 23:07:32 +0000 (Sun, 26 Jul 2009) Log Message: ----------- Change CMake variable name that distinguishes the core and installed examples builds from core_build --> CORE_BUILD Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-07-25 06:33:04 UTC (rev 10178) +++ trunk/cmake/modules/plplot.cmake 2009-07-26 23:07:32 UTC (rev 10179) @@ -60,11 +60,11 @@ include(instdirs) include(rpath) -# Common CMakeList.txt files are used to build the examples in the build +# Common CMakeLists.txt files are used to build the examples in the build # tree and also to build the installed examples by the new CMake-based build # system devoted to that purpose. Set this fundamental identification to # distinguish the two cases. -set(core_build ON) +set(CORE_BUILD ON) option(BUILD_TEST "Compile examples in the build tree and enable ctest" OFF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-11-29 02:29:37
|
Revision: 12066 http://plplot.svn.sourceforge.net/plplot/?rev=12066&view=rev Author: airwin Date: 2011-11-29 02:29:30 +0000 (Tue, 29 Nov 2011) Log Message: ----------- Provide NON_TRANSITIVE ON option only for the case of shared libraries. For the internal static library case, transitive linking is used regardless by CMake so the only effect of NON_TRANSITIVE ON for this case would be non-transitive linking for pkg-config used by the traditional build and test of the installed examples. Such linking can introduce inconsistencies with the linking and software library detection of the core PLplot build. So avoid that potential inconsistency by simply not allowing NON_TRANSITIVE ON for the static internal library build for PLplot. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2011-11-28 22:37:50 UTC (rev 12065) +++ trunk/cmake/modules/plplot.cmake 2011-11-29 02:29:30 UTC (rev 12066) @@ -37,11 +37,15 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") endif(FORCE_EXTERNAL_STATIC) -# OFF means shared libraries (but never static libraries) are -# transitively linked by default by CMake and also by pkg-config (used -# to generate compile and link flags for the traditional build and -# test system of the installed examples). -option(NON_TRANSITIVE "Experimental option to try non-transitive linking" OFF) +if(BUILD_SHARED_LIBS) + # OFF means shared libraries (but never static libraries) are + # transitively linked by default by CMake and also by pkg-config (used + # to generate compile and link flags for the traditional build and + # test system of the installed examples). + option(NON_TRANSITIVE "Experimental option to try non-transitive linking" OFF) +else(BUILD_SHARED_LIBS) + set(NON_TRANSITIVE OFF CACHE BOOL "Experimental option to try non-transitive linking" FORCE) +endif(BUILD_SHARED_LIBS) # Color maps (discrete and continuous) to use by default if(NOT DEFAULT_CMAP0_FILE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2012-02-10 22:03:59
|
Revision: 12165 http://plplot.svn.sourceforge.net/plplot/?rev=12165&view=rev Author: airwin Date: 2012-02-10 22:03:53 +0000 (Fri, 10 Feb 2012) Log Message: ----------- Use NON_TRANSITIVE linking by default for the shared libraries case for all non-windows systems. The reason for this change is it appears that this option (which prevents overlinking) works well on Linux. I have assumed that is also the case on Mac OS X, and _not_ the case on Windows systems, but those assumptions need testing. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2012-02-01 10:11:21 UTC (rev 12164) +++ trunk/cmake/modules/plplot.cmake 2012-02-10 22:03:53 UTC (rev 12165) @@ -42,9 +42,13 @@ # transitively linked by default by CMake and also by pkg-config (used # to generate compile and link flags for the traditional build and # test system of the installed examples). - option(NON_TRANSITIVE "Experimental option to try non-transitive linking" OFF) + if(WIN32) + option(NON_TRANSITIVE "Option to use non-transitive linking" OFF) + else(WIN32) + option(NON_TRANSITIVE "Option to use non-transitive linking" ON) + endif(WIN32) else(BUILD_SHARED_LIBS) - set(NON_TRANSITIVE OFF CACHE BOOL "Experimental option to try non-transitive linking" FORCE) + set(NON_TRANSITIVE OFF CACHE BOOL "Option to use non-transitive linking" FORCE) endif(BUILD_SHARED_LIBS) # Color maps (discrete and continuous) to use by default This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-02-27 21:17:36
|
Revision: 9630 http://plplot.svn.sourceforge.net/plplot/?rev=9630&view=rev Author: smekal Date: 2009-02-27 21:17:34 +0000 (Fri, 27 Feb 2009) Log Message: ----------- Fixed the logic for finding isnan/finite/isinf for Visual C++ compilers. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-02-27 03:00:14 UTC (rev 9629) +++ trunk/cmake/modules/plplot.cmake 2009-02-27 21:17:34 UTC (rev 9630) @@ -201,47 +201,64 @@ # Check for FP functions, including underscored version which # are sometimes all that is available on windows + + check_symbol_exists(finite "math.h" HAVE_FINITE) if(NOT HAVE_FINITE) check_function_exists(finite HAVE_FINITE2) + if(HAVE_FINITE2) + set(HAVE_FINITE ${HAVE_FINITE2} CACHE INTERNAL "Have function finite") + else(HAVE_FINITE2) + check_symbol_exists(_finite "math.h" _HAVE_FINITE) + if(NOT _HAVE_FINITE) + check_function_exists(_finite _HAVE_FINITE2) + if(_HAVE_FINITE2) + set(_HAVE_FINITE ${_HAVE_FINITE2} CACHE INTERNAL "Have function _finite") + set(HAVE_FINITE ${_HAVE_FINITE} CACHE INTERNAL "Have function _finite") + endif(_HAVE_FINITE2) + set(_HAVE_FINITE2 "" CACHE INTERNAL "Have function _finite") + endif(NOT _HAVE_FINITE) + endif(HAVE_FINITE2) + set(HAVE_FINITE2 "" CACHE INTERNAL "Have function finite") endif(NOT HAVE_FINITE) -set(HAVE_FINITE ${HAVE_FINITE2}) -if(NOT HAVE_FINITE) - check_symbol_exists(_finite "math.h" _HAVE_FINITE) - if(NOT _HAVE_FINITE) - check_function_exists(_finite _HAVE_FINITE2) - endif(NOT _HAVE_FINITE) - set(_HAVE_FINITE ${_HAVE_FINITE2}) - set(HAVE_FINITE ${_HAVE_FINITE} CACHE INTERNAL "Have function _finite") -endif(NOT HAVE_FINITE) check_symbol_exists(isnan "math.h" HAVE_ISNAN) if(NOT HAVE_ISNAN) check_function_exists(isnan HAVE_ISNAN2) + if(HAVE_ISNAN2) + set(HAVE_ISNAN ${HAVE_ISNAN2} CACHE INTERNAL "Have function isnan") + else(HAVE_ISNAN2) + check_symbol_exists(_isnan "math.h" _HAVE_ISNAN) + if(NOT _HAVE_ISNAN) + check_function_exists(_isnan _HAVE_ISNAN2) + if(_HAVE_ISNAN2) + set(_HAVE_ISNAN ${_HAVE_ISNAN2} CACHE INTERNAL "Have function _isnan") + set(HAVE_ISNAN ${_HAVE_ISNAN} CACHE INTERNAL "Have function _isnan") + endif(_HAVE_ISNAN2) + set(_HAVE_ISNAN2 "" CACHE INTERNAL "Have function _isnan") + endif(NOT _HAVE_ISNAN) + endif(HAVE_ISNAN2) + set(HAVE_ISNAN2 "" CACHE INTERNAL "Have function isnan") endif(NOT HAVE_ISNAN) -set(HAVE_ISNAN ${HAVE_ISNAN2}) -if(NOT HAVE_ISNAN) - check_symbol_exists(_isnan "math.h" _HAVE_ISNAN) - if(NOT _HAVE_ISNAN) - check_function_exists(_isnan _HAVE_ISNAN2) - endif(NOT _HAVE_ISNAN) - set(_HAVE_ISNAN ${_HAVE_ISNAN2}) - set(HAVE_ISNAN ${_HAVE_ISNAN} CACHE INTERNAL "Have function _isnan") -endif(NOT HAVE_ISNAN) -check_symbol_exists(isinf "math.h" HAVE_ISINF) +check_symbol_exists(ising "math.h" HAVE_ISINF) if(NOT HAVE_ISINF) - check_function_exists(isinf HAVE_ISINF2) + check_function_exists(ising HAVE_ISINF2) + if(HAVE_ISINF2) + set(HAVE_ISINF ${HAVE_ISINF2} CACHE INTERNAL "Have function ising") + else(HAVE_ISINF2) + check_symbol_exists(_ising "math.h" _HAVE_ISINF) + if(NOT _HAVE_ISINF) + check_function_exists(_ising _HAVE_ISINF2) + if(_HAVE_ISINF2) + set(_HAVE_ISINF ${_HAVE_ISINF2} CACHE INTERNAL "Have function _ising") + set(HAVE_ISINF ${_HAVE_ISINF} CACHE INTERNAL "Have function _ising") + endif(_HAVE_ISINF2) + set(_HAVE_ISINF2 "" CACHE INTERNAL "Have function _ising") + endif(NOT _HAVE_ISINF) + endif(HAVE_ISINF2) + set(HAVE_ISINF2 "" CACHE INTERNAL "Have function ising") endif(NOT HAVE_ISINF) -set(HAVE_ISINF ${HAVE_ISINF2}) -if(NOT HAVE_ISINF) - check_symbol_exists(_isinf "math.h" _HAVE_ISINF) - if(NOT _HAVE_ISINF) - check_function_exists(_isinf _HAVE_ISINF2) - endif(NOT _HAVE_ISINF) - set(_HAVE_ISINF ${_HAVE_ISINF2}) - set(HAVE_ISINF ${_HAVE_ISINF} CACHE INTERNAL "Have function _isinf") -endif(NOT HAVE_ISINF) check_function_exists(snprintf PL_HAVE_SNPRINTF) if(NOT PL_HAVE_SNPRINTF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-03-03 07:18:53
|
Revision: 9663 http://plplot.svn.sourceforge.net/plplot/?rev=9663&view=rev Author: smekal Date: 2009-03-03 07:18:44 +0000 (Tue, 03 Mar 2009) Log Message: ----------- Changed the CMake build system logic again for finding finite, isnan and isinf functions. Tested with Visual C++ and MinGW on Win32. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-03-03 00:46:23 UTC (rev 9662) +++ trunk/cmake/modules/plplot.cmake 2009-03-03 07:18:44 UTC (rev 9663) @@ -202,63 +202,75 @@ # Check for FP functions, including underscored version which # are sometimes all that is available on windows +check_symbol_exists(finite "math.h" HAVE_FINITE_SYMBOL) +if(HAVE_FINITE_SYMBOL) + set(HAVE_FINITE ON) +else(HAVE_FINITE_SYMBOL) + check_function_exists(finite HAVE_FINITE_FUNCTION) + if(HAVE_FINITE_FUNCTION) + set(HAVE_FINITE ON) + else(HAVE_FINITE_FUNCTION) + check_symbol_exists(_finite "math.h" HAVE__FINITE_SYMBOL) + if(HAVE__FINITE_SYMBOL) + set(_HAVE_FINITE ON) + else(HAVE__FINITE_SYMBOL) + check_function_exists(_finite HAVE__FINITE_FUNCTION) + if(HAVE__FINITE_FUNCTION) + set(_HAVE_FINITE ON) + endif(HAVE__FINITE_FUNCTION) + endif(HAVE__FINITE_SYMBOL) + endif(HAVE_FINITE_FUNCTION) +endif(HAVE_FINITE_SYMBOL) +if(_HAVE_FINITE) + set(HAVE_FINITE ON) +endif(_HAVE_FINITE) -check_symbol_exists(finite "math.h" HAVE_FINITE) -if(NOT HAVE_FINITE) - check_function_exists(finite HAVE_FINITE2) - if(HAVE_FINITE2) - set(HAVE_FINITE ${HAVE_FINITE2} CACHE INTERNAL "Have function finite") - else(HAVE_FINITE2) - check_symbol_exists(_finite "math.h" _HAVE_FINITE) - if(NOT _HAVE_FINITE) - check_function_exists(_finite _HAVE_FINITE2) - if(_HAVE_FINITE2) - set(_HAVE_FINITE ${_HAVE_FINITE2} CACHE INTERNAL "Have function _finite") - set(HAVE_FINITE ${_HAVE_FINITE} CACHE INTERNAL "Have function _finite") - endif(_HAVE_FINITE2) - set(_HAVE_FINITE2 "" CACHE INTERNAL "Have function _finite") - endif(NOT _HAVE_FINITE) - endif(HAVE_FINITE2) - set(HAVE_FINITE2 "" CACHE INTERNAL "Have function finite") -endif(NOT HAVE_FINITE) +check_symbol_exists(isnan "math.h" HAVE_ISNAN_SYMBOL) +if(HAVE_ISNAN_SYMBOL) + set(HAVE_ISNAN ON) +else(HAVE_ISNAN_SYMBOL) + check_function_exists(isnan HAVE_ISNAN_FUNCTION) + if(HAVE_ISNAN_FUNCTION) + set(HAVE_ISNAN ON) + else(HAVE_ISNAN_FUNCTION) + check_symbol_exists(_isnan "math.h" HAVE__ISNAN_SYMBOL) + if(HAVE__ISNAN_SYMBOL) + set(_HAVE_ISNAN ON) + else(HAVE__ISNAN_SYMBOL) + check_function_exists(_isnan HAVE__ISNAN_FUNCTION) + if(HAVE__ISNAN_FUNCTION) + set(_HAVE_ISNAN ON) + endif(HAVE__ISNAN_FUNCTION) + endif(HAVE__ISNAN_SYMBOL) + endif(HAVE_ISNAN_FUNCTION) +endif(HAVE_ISNAN_SYMBOL) +if(_HAVE_ISNAN) + set(HAVE_ISNAN ON) +endif(_HAVE_ISNAN) -check_symbol_exists(isnan "math.h" HAVE_ISNAN) -if(NOT HAVE_ISNAN) - check_function_exists(isnan HAVE_ISNAN2) - if(HAVE_ISNAN2) - set(HAVE_ISNAN ${HAVE_ISNAN2} CACHE INTERNAL "Have function isnan") - else(HAVE_ISNAN2) - check_symbol_exists(_isnan "math.h" _HAVE_ISNAN) - if(NOT _HAVE_ISNAN) - check_function_exists(_isnan _HAVE_ISNAN2) - if(_HAVE_ISNAN2) - set(_HAVE_ISNAN ${_HAVE_ISNAN2} CACHE INTERNAL "Have function _isnan") - set(HAVE_ISNAN ${_HAVE_ISNAN} CACHE INTERNAL "Have function _isnan") - endif(_HAVE_ISNAN2) - set(_HAVE_ISNAN2 "" CACHE INTERNAL "Have function _isnan") - endif(NOT _HAVE_ISNAN) - endif(HAVE_ISNAN2) - set(HAVE_ISNAN2 "" CACHE INTERNAL "Have function isnan") -endif(NOT HAVE_ISNAN) +check_symbol_exists(isinf "math.h" HAVE_ISINF_SYMBOL) +if(HAVE_ISINF_SYMBOL) + set(HAVE_ISINF ON) +else(HAVE_ISINF_SYMBOL) + check_function_exists(isinf HAVE_ISINF_FUNCTION) + if(HAVE_ISINF_FUNCTION) + set(HAVE_ISINF ON) + else(HAVE_ISINF_FUNCTION) + check_symbol_exists(_isinf "math.h" HAVE__ISINF_SYMBOL) + if(HAVE__ISINF_SYMBOL) + set(_HAVE_ISINF ON) + else(HAVE__ISINF_SYMBOL) + check_function_exists(_isinf HAVE__ISINF_FUNCTION) + if(HAVE__ISINF_FUNCTION) + set(_HAVE_ISINF ON) + endif(HAVE__ISINF_FUNCTION) + endif(HAVE__ISINF_SYMBOL) + endif(HAVE_ISINF_FUNCTION) +endif(HAVE_ISINF_SYMBOL) +if(_HAVE_ISINF) + set(HAVE_ISINF ON) +endif(_HAVE_ISINF) -check_symbol_exists(ising "math.h" HAVE_ISINF) -if(NOT HAVE_ISINF) - check_function_exists(ising HAVE_ISINF2) - if(HAVE_ISINF2) - set(HAVE_ISINF ${HAVE_ISINF2} CACHE INTERNAL "Have function ising") - else(HAVE_ISINF2) - check_symbol_exists(_ising "math.h" _HAVE_ISINF) - if(NOT _HAVE_ISINF) - check_function_exists(_ising _HAVE_ISINF2) - if(_HAVE_ISINF2) - set(_HAVE_ISINF ${_HAVE_ISINF2} CACHE INTERNAL "Have function _ising") - set(HAVE_ISINF ${_HAVE_ISINF} CACHE INTERNAL "Have function _ising") - endif(_HAVE_ISINF2) - set(_HAVE_ISINF2 "" CACHE INTERNAL "Have function _ising") - endif(NOT _HAVE_ISINF) - endif(HAVE_ISINF2) - set(HAVE_ISINF2 "" CACHE INTERNAL "Have function ising") -endif(NOT HAVE_ISINF) check_function_exists(snprintf PL_HAVE_SNPRINTF) if(NOT PL_HAVE_SNPRINTF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-05-08 20:30:32
|
Revision: 9944 http://plplot.svn.sourceforge.net/plplot/?rev=9944&view=rev Author: airwin Date: 2009-05-08 20:30:19 +0000 (Fri, 08 May 2009) Log Message: ----------- Only use the appropriate component of QT_LIBRARIES depending on the embedded keywords. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-05-08 18:39:36 UTC (rev 9943) +++ trunk/cmake/modules/plplot.cmake 2009-05-08 20:30:19 UTC (rev 9944) @@ -28,6 +28,8 @@ include(CheckSymbolExists) include(CheckPrototypeExists) +# Useful macros.... + macro(TRANSFORM_VERSION _numerical_result _version) # _version must be a period-delimited triplet string of the form # "major.minor.patch". @@ -44,6 +46,30 @@ endif(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$") endmacro(TRANSFORM_VERSION) +macro(split_libraries_list _list _list_general _list_debug _list_optimized) + # Macro for splitting a libraries list into its keyword denoted general, + # debug, and optimized lists. + set(${_list_general}) + set(${_list_debug}) + set(${_list_optimized}) + + set(_keyword "general") + foreach(_element ${${_list}}) + if(_element STREQUAL "general" OR _element STREQUAL "debug" OR _element STREQUAL "optimized" ) + set(_keyword ${_element}) + else(_element STREQUAL "general" OR _element STREQUAL "debug" OR _element STREQUAL "optimized" ) + if(_keyword STREQUAL "general") + list(APPEND ${_list_general} ${_element}) + elseif(_keyword STREQUAL "debug") + list(APPEND ${_list_debug} ${_element}) + elseif(_keyword STREQUAL "optimized") + list(APPEND ${_list_optimized} ${_element}) + endif(_keyword STREQUAL "general") + endif(_element STREQUAL "general" OR _element STREQUAL "debug" OR _element STREQUAL "optimized" ) + endforeach(_element) + +endmacro(split_libraries_list _list _list_general _list_debug _list_optimized) + # ======================================================================= # Compilation and build options (PLFLT, install locations, and rpath) # Note, must come before java since that depends on, e.g., LIB_DIR. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-18 18:03:50
|
Revision: 10158 http://plplot.svn.sourceforge.net/plplot/?rev=10158&view=rev Author: airwin Date: 2009-07-18 18:03:49 +0000 (Sat, 18 Jul 2009) Log Message: ----------- Distinguish between core build of the examples in the build tree and installed examples build to allow common CMakeLists.txt files to be used for the two separate build systems. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-07-18 02:09:33 UTC (rev 10157) +++ trunk/cmake/modules/plplot.cmake 2009-07-18 18:03:49 UTC (rev 10158) @@ -60,7 +60,14 @@ include(instdirs) include(rpath) +# Common CMakeList.txt files are used to build the examples in the build +# tree and also to build the installed examples by the new CMake-based build +# system devoted to that purpose. Set this fundamental identification to +# distinguish the two cases. +set(core_build ON) + option(BUILD_TEST "Compile examples in the build tree and enable ctest" OFF) + # Use bash when available for ctest and install tree test support find_program(SH_EXECUTABLE bash) find_program(SH_EXECUTABLE win-bash) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-28 21:03:10
|
Revision: 10187 http://plplot.svn.sourceforge.net/plplot/?rev=10187&view=rev Author: airwin Date: 2009-07-28 21:02:56 +0000 (Tue, 28 Jul 2009) Log Message: ----------- Change TRANSFORM_VERSION from a macro to a function. Make that function much more robust against version string variations including ignoring everything in the version string after any character that is not in [0-9.] and replacing any patch, minor, or major substring that does not match [0-9]+ with 0. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2009-07-28 18:52:56 UTC (rev 10186) +++ trunk/cmake/modules/plplot.cmake 2009-07-28 21:02:56 UTC (rev 10187) @@ -28,24 +28,44 @@ include(CheckSymbolExists) include(CheckPrototypeExists) -# Useful macros go here. +# Useful functions go here. -macro(TRANSFORM_VERSION _numerical_result _version) -# _version must be a period-delimited triplet string of the form -# "major.minor.patch". -# This macro transforms that into a numerical result that can be compared. -if(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$") - string(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\.[0-9]*$" "\\1" _major ${_version}) - string(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\.[0-9]*$" "\\1" _minor ${_version}) - string(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" _patch ${_version}) - math(EXPR ${_numerical_result} - "${_major}*1000000 + ${_minor}*1000 + ${_patch} - ") -else(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$") - set(${_numerical_result} 0) -endif(${_version} MATCHES "^[0-9]*\\.[0-9]*\\.[0-9]*$") -endmacro(TRANSFORM_VERSION) +function(TRANSFORM_VERSION numerical_result version) + # internal_version ignores everything in version after any character that + # is not 0-9 or ".". This should take care of the case when there is + # some non-numerical data in the patch version. + #message(STATUS "DEBUG: version = ${version}") + string(REGEX REPLACE "^([0-9.]+).*$" "\\1" internal_version ${version}) + # internal_version is normally a period-delimited triplet string of the form + # "major.minor.patch", but patch and/or minor could be missing. + # Transform internal_version into a numerical result that can be compared. + string(REGEX REPLACE "^([0-9]*).+$" "\\1" major ${internal_version}) + string(REGEX REPLACE "^[0-9]*\\.([0-9]*).*$" "\\1" minor ${internal_version}) + string(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" patch ${internal_version}) + + if(NOT patch MATCHES "[0-9]+") + set(patch 0) + endif(NOT patch MATCHES "[0-9]+") + + if(NOT minor MATCHES "[0-9]+") + set(minor 0) + endif(NOT minor MATCHES "[0-9]+") + + if(NOT major MATCHES "[0-9]+") + set(major 0) + endif(NOT major MATCHES "[0-9]+") + #message(STATUS "DEBUG: internal_version = ${internal_version}") + #message(STATUS "DEBUG: major = ${major}") + #message(STATUS "DEBUG: minor= ${minor}") + #message(STATUS "DEBUG: patch = ${patch}") + math(EXPR internal_numerical_result + "${major}*1000000 + ${minor}*1000 + ${patch}" + ) + #message(STATUS "DEBUG: ${numerical_result} = ${internal_numerical_result}") + set(${numerical_result} ${internal_numerical_result} PARENT_SCOPE) +endfunction(TRANSFORM_VERSION) + # ======================================================================= # Compilation and build options (PLFLT, install locations, and rpath) # Note, must come before java since that depends on, e.g., LIB_DIR. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-02-08 19:37:49
|
Revision: 10797 http://plplot.svn.sourceforge.net/plplot/?rev=10797&view=rev Author: airwin Date: 2010-02-08 19:37:43 +0000 (Mon, 08 Feb 2010) Log Message: ----------- Comment out debugging messages. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2010-02-08 19:33:38 UTC (rev 10796) +++ trunk/cmake/modules/plplot.cmake 2010-02-08 19:37:43 UTC (rev 10797) @@ -91,7 +91,7 @@ # Filter all CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES list elements from # rpath_in list. function(filter_rpath rpath) - message("DEBUG: ${rpath} = ${${rpath}}") + #message("DEBUG: ${rpath} = ${${rpath}}") set(internal_rpath ${${rpath}}) if(internal_rpath) list(REMOVE_DUPLICATES internal_rpath) @@ -99,7 +99,7 @@ list(REMOVE_ITEM internal_rpath ${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}) endif(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) endif(internal_rpath) - message("DEBUG: (filtered) ${rpath} = ${internal_rpath}") + #message("DEBUG: (filtered) ${rpath} = ${internal_rpath}") set(${rpath} ${internal_rpath} PARENT_SCOPE) endfunction(filter_rpath) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-12-01 18:09:14
|
Revision: 11358 http://plplot.svn.sourceforge.net/plplot/?rev=11358&view=rev Author: airwin Date: 2010-12-01 18:09:08 +0000 (Wed, 01 Dec 2010) Log Message: ----------- Output which bash version is being used. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2010-12-01 15:52:34 UTC (rev 11357) +++ trunk/cmake/modules/plplot.cmake 2010-12-01 18:09:08 UTC (rev 11358) @@ -133,6 +133,7 @@ else(SH_EXECUTABLE) find_program(SH_EXECUTABLE sh) endif(SH_EXECUTABLE) +message(STATUS "SH_EXECUTABLE = ${SH_EXECUTABLE}") if(NOT SH_EXECUTABLE) message(STATUS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-10-17 20:22:59
|
Revision: 11972 http://plplot.svn.sourceforge.net/plplot/?rev=11972&view=rev Author: andrewross Date: 2011-10-17 20:22:53 +0000 (Mon, 17 Oct 2011) Log Message: ----------- Fix bug where cmake check on availability of unlink actually checks for mkstemp! Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2011-10-14 09:28:58 UTC (rev 11971) +++ trunk/cmake/modules/plplot.cmake 2011-10-17 20:22:53 UTC (rev 11972) @@ -220,7 +220,7 @@ check_function_exists(popen HAVE_POPEN) check_function_exists(usleep PL_HAVE_USLEEP) check_function_exists(mkstemp PL_HAVE_MKSTEMP) -check_function_exists(mkstemp PL_HAVE_UNLINK) +check_function_exists(unlink PL_HAVE_UNLINK) check_function_exists(_NSGetArgc HAVE_NSGETARGC) # Check for FP functions, including underscored version which This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-11-26 21:45:04
|
Revision: 12055 http://plplot.svn.sourceforge.net/plplot/?rev=12055&view=rev Author: airwin Date: 2011-11-26 21:44:58 +0000 (Sat, 26 Nov 2011) Log Message: ----------- PC_REQUIRES_TAG always set locally so drop setting a default global value for that variable/ Improve commentary concerning the NON_TRANSITIVE option. Implement the FORCE_EXTERNAL_STATIC option for the (internal) static library case (NOT BUILD_SHARED_LIBS) to force CMake to find and use only external libraries with a *.a suffix (i.e., static libraries). This suffix trick only works with UNIX so FORCE_EXTERNAL_STATIC is ignored in all other cases. The option is experimental. In fact, it still does not completely work at this time because of pkg-config complications. Therefore, its default value is OFF. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2011-11-26 21:33:35 UTC (rev 12054) +++ trunk/cmake/modules/plplot.cmake 2011-11-26 21:44:58 UTC (rev 12055) @@ -22,12 +22,24 @@ # libraries are all shared by default option(BUILD_SHARED_LIBS "Build shared libraries" ON) -# OFF means libraries are transitively linked by default. +if(NOT BUILD_SHARED_LIBS) + option(FORCE_EXTERNAL_STATIC "Force external UNIX libraries to be static" OFF) +endif(NOT BUILD_SHARED_LIBS) + +# CYGWIN eliminated here because .a suffix is not sufficient to guarantee a +# static library on that platform. +if(UNIX AND NOT CYGWIN AND FORCE_EXTERNAL_STATIC) + # All find_library commands append this suffix to the searched name so + # this always forces find_library to find only the Unix static library + # if it exists or fail if it doesn't exist. + set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") +endif(UNIX AND NOT CYGWIN AND FORCE_EXTERNAL_STATIC) + +# OFF means shared libraries (but never static libraries) are +# transitively linked by default by CMake and also by pkg-config (used +# to generate compile and link flags for the traditional build and +# test system of the installed examples). option(NON_TRANSITIVE "Experimental option to try non-transitive linking" OFF) -# For now use this default which causes transitive linking of software built -# with our pkg-config files (unless PC_REQUIRES_TAG specifically overridden -# for particular language bindings with Requires.private). -set(PC_REQUIRES_TAG "Requires") # Color maps (discrete and continuous) to use by default if(NOT DEFAULT_CMAP0_FILE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-11-27 19:11:30
|
Revision: 12056 http://plplot.svn.sourceforge.net/plplot/?rev=12056&view=rev Author: airwin Date: 2011-11-27 19:11:24 +0000 (Sun, 27 Nov 2011) Log Message: ----------- More reliable setting and unsetting of FORCE_EXTERNAL_STATIC. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2011-11-26 21:44:58 UTC (rev 12055) +++ trunk/cmake/modules/plplot.cmake 2011-11-27 19:11:24 UTC (rev 12056) @@ -22,18 +22,20 @@ # libraries are all shared by default option(BUILD_SHARED_LIBS "Build shared libraries" ON) -if(NOT BUILD_SHARED_LIBS) +# CYGWIN eliminated here because .a suffix is not sufficient to guarantee a +# static library on that platform. +if(UNIX AND NOT CYGWIN AND NOT BUILD_SHARED_LIBS) option(FORCE_EXTERNAL_STATIC "Force external UNIX libraries to be static" OFF) -endif(NOT BUILD_SHARED_LIBS) +else(UNIX AND NOT CYGWIN AND NOT BUILD_SHARED_LIBS) + set(FORCE_EXTERNAL_STATIC OFF CACHE BOOL "Force external UNIX libraries to be static" FORCE) +endif(UNIX AND NOT CYGWIN AND NOT BUILD_SHARED_LIBS) -# CYGWIN eliminated here because .a suffix is not sufficient to guarantee a -# static library on that platform. -if(UNIX AND NOT CYGWIN AND FORCE_EXTERNAL_STATIC) +if(FORCE_EXTERNAL_STATIC) # All find_library commands append this suffix to the searched name so # this always forces find_library to find only the Unix static library # if it exists or fail if it doesn't exist. set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") -endif(UNIX AND NOT CYGWIN AND FORCE_EXTERNAL_STATIC) +endif(FORCE_EXTERNAL_STATIC) # OFF means shared libraries (but never static libraries) are # transitively linked by default by CMake and also by pkg-config (used This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-01-03 12:01:51
|
Revision: 12112 http://plplot.svn.sourceforge.net/plplot/?rev=12112&view=rev Author: andrewross Date: 2012-01-03 12:01:41 +0000 (Tue, 03 Jan 2012) Log Message: ----------- Ensure PL_DEPRECATED is initialised to OFF by default. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2012-01-03 10:20:31 UTC (rev 12111) +++ trunk/cmake/modules/plplot.cmake 2012-01-03 12:01:41 UTC (rev 12112) @@ -56,9 +56,13 @@ set(DEFAULT_CMAP1_FILE "cmap1_default.pal") endif(NOT DEFAULT_CMAP1_FILE) +# Deprecated functions are not included by default. Set to ON if you +# require this for backwards compatibility. +option(PL_DEPRECATED "Include support for deprecated functions" OFF) + # Set to ON if want to use general fill_intersection_polygon approach # rather than the traditional code to fill the intersection of a -# polygon with the clipping limits. */ +# polygon with the clipping limits. option(USE_FILL_INTERSECTION_POLYGON "use fill_intersection_polygon" OFF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-03-13 02:24:19
|
Revision: 12295 http://plplot.svn.sourceforge.net/plplot/?rev=12295&view=rev Author: airwin Date: 2013-03-13 02:24:09 +0000 (Wed, 13 Mar 2013) Log Message: ----------- Implement experimental STATIC_RUNTIME option to allow users of Microsoft C and C++ compilers to specify a static runtime. MinGW is specifically excluded because that set of compilers apparently does not support a static runtime according to http://lists-archives.com/mingw-users/00126-mingw-msvc-md-mt-ml.html. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2013-03-04 16:29:16 UTC (rev 12294) +++ trunk/cmake/modules/plplot.cmake 2013-03-13 02:24:09 UTC (rev 12295) @@ -474,6 +474,39 @@ include(d) # ======================================================================= +# Option to change to static run-time support for Microsoft C and +# C++ compilers. This method should only work after those +# compilers are enabled (C is already enabled for the whole project +# and C++ should be enabled above). +# ======================================================================= +if(WIN32 AND NOT MINGW) + # MinGW excluded because it does not enable a static runtime according + # to http://lists-archives.com/mingw-users/00126-mingw-msvc-md-mt-ml.html . + option(STATIC_RUNTIME "Set Windows non-MinGW compiler static runtime linkage if requested" OFF) + if(STATIC_RUNTIME) + set(flag_vars + CMAKE_C_FLAGS + CMAKE_C_FLAGS_DEBUG + CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL + CMAKE_C_FLAGS_RELWITHDEBINFO + CMAKE_CXX_FLAGS + CMAKE_CXX_FLAGS_DEBUG + CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_MINSIZEREL + CMAKE_CXX_FLAGS_RELWITHDEBINFO + ) + + foreach(flag_var ${flag_vars}) + if(${flag_var} MATCHES "/MD") + string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}") + set(${flag_var} "${${flag_var}}" CACHE STRING "Flags used by the compiler" FORCE) + endif(${flag_var} MATCHES "/MD") + endforeach(flag_var ${flag_vars}) + endif(STATIC_RUNTIME) +endif(WIN32 AND NOT MINGW) + +# ======================================================================= # additional library support # ======================================================================= include(freetype) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-12-16 23:51:46
|
Revision: 12869 http://sourceforge.net/p/plplot/code/12869 Author: airwin Date: 2013-12-16 23:51:43 +0000 (Mon, 16 Dec 2013) Log Message: ----------- Tweak commentary concerning placement of certain includes which use the filter_rpath function which depends on languages being defined. Modified Paths: -------------- trunk/cmake/modules/plplot.cmake Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2013-12-16 00:14:36 UTC (rev 12868) +++ trunk/cmake/modules/plplot.cmake 2013-12-16 23:51:43 UTC (rev 12869) @@ -464,6 +464,7 @@ include(java) include(python) include(octave) +# tcl-related must come after c++ and fortran because of use of filter_rpath include(tcl-related) include(pdl) include(ada) @@ -509,6 +510,7 @@ # ======================================================================= # additional library support # ======================================================================= +# shapelib must come after c++ and fortran because of use of filter_rpath # Support for shapelib library for reading shapefile map data include(shapelib) include(freetype) @@ -520,7 +522,8 @@ message(FATAL_ERROR "Cannot find required math library") endif(NOT MATH_LIB) endif(NOT WIN32_OR_CYGWIN) -# Must come after MATH_LIB is defined (or not). +# csiro must come after MATH_LIB is defined (or not). +# csiro must come after c++ and fortran because of use of filter_rpath include(csiro) @@ -532,6 +535,7 @@ # ======================================================================= # Device drivers # ======================================================================= +# drivers must come after c++ and fortran because of use of filter_rpath include(drivers) # ======================================================================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |