Menu
▾
▴
plplot-cvs
|
From: <sm...@us...> - 2008-07-24 13:48:41
|
Revision: 8581
http://plplot.svn.sourceforge.net/plplot/?rev=8581&view=rev
Author: smekal
Date: 2008-07-24 13:48:49 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
CMakeLists.txt file in www will also be processed.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2008-07-24 13:48:08 UTC (rev 8580)
+++ trunk/CMakeLists.txt 2008-07-24 13:48:49 UTC (rev 8581)
@@ -120,6 +120,7 @@
add_subdirectory(plplot_test)
add_subdirectory(scripts)
add_subdirectory(doc)
+add_subdirectory(www)
add_subdirectory(pkgcfg)
# needs no cmake processing
#add_subdirectory(cf)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2008-08-23 16:56:50
|
Revision: 8705
http://plplot.svn.sourceforge.net/plplot/?rev=8705&view=rev
Author: airwin
Date: 2008-08-23 16:57:00 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
Exclude .svn directories (rather than CVS directories) from source
distribution. "make package_source" in the build tree now produces a
tarball uncluttered by files in the .svn subdirectories of the source tree.
(Our previous use of "make package_source" for creating our distribution
tarballs was done in svn exported trees which had no .svn subdirectories so we
did not encounter this bug in our previous releases.)
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2008-08-23 16:56:46 UTC (rev 8704)
+++ trunk/CMakeLists.txt 2008-08-23 16:57:00 UTC (rev 8705)
@@ -202,7 +202,7 @@
set(CPACK_SOURCE_IGNORE_FILES
"~$"
"\\\\.cvsignore$"
-"^${PROJECT_SOURCE_DIR}.*/CVS/"
+"^${PROJECT_SOURCE_DIR}.*/\\\\.svn/"
"^${PROJECT_SOURCE_DIR}/old/"
"^${PROJECT_SOURCE_DIR}/sys/mac"
"^${PROJECT_SOURCE_DIR}/sys/os2"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2008-08-31 12:25:27
|
Revision: 8731
http://plplot.svn.sourceforge.net/plplot/?rev=8731&view=rev
Author: smekal
Date: 2008-08-31 12:25:36 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
For the MinGW compiler the MINGWLIBPATH variable is set to the import library path of the MinGW distribution, by getting the path component of the absolute filename of the MinGW C compiler (CMAKE_C_COMPILER).
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2008-08-31 10:27:59 UTC (rev 8730)
+++ trunk/CMakeLists.txt 2008-08-31 12:25:36 UTC (rev 8731)
@@ -46,6 +46,15 @@
# Location where PLplot cmake build system first looks for cmake modules.
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
+# We need the path to the MinGW compiler in order to find
+# the import libraries for system libraries.
+IF(MINGW)
+ get_filename_component(MINGWBINPATH ${CMAKE_C_COMPILER} PATH)
+ set(MINGWLIBPATH ${MINGWBINPATH}/../lib
+ CACHE FILEPATH
+ DOCSTRING "Path to MinGW import libraries")
+ENDIF(MINGW)
+
# Version data that need modification for each release.
include(plplot_version)
# parameters to control overall cmake behaviour.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-01-11 02:40:04
|
Revision: 9292
http://plplot.svn.sourceforge.net/plplot/?rev=9292&view=rev
Author: airwin
Date: 2009-01-11 02:39:52 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
Install README.testing file.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2009-01-11 02:38:38 UTC (rev 9291)
+++ trunk/CMakeLists.txt 2009-01-11 02:39:52 UTC (rev 9292)
@@ -104,6 +104,7 @@
PROBLEMS
README
README.release
+README.testing
)
install(FILES ${top_level_DOCFILES} DESTINATION ${DOC_DIR})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-01-22 19:07:56
|
Revision: 9369
http://plplot.svn.sourceforge.net/plplot/?rev=9369&view=rev
Author: airwin
Date: 2009-01-22 19:07:47 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Add fonts directory to allow optional build of Hershey fonts.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2009-01-22 19:06:52 UTC (rev 9368)
+++ trunk/CMakeLists.txt 2009-01-22 19:07:47 UTC (rev 9369)
@@ -123,8 +123,7 @@
# is determined by the dependencies between targets and also by file
# dependencies that are established by the cmake configuration files.
-# needs no cmake processing
-#add_subdirectory(fonts)
+add_subdirectory(fonts)
add_subdirectory(lib)
add_subdirectory(include)
add_subdirectory(src)
@@ -138,8 +137,6 @@
add_subdirectory(doc)
add_subdirectory(www)
add_subdirectory(pkgcfg)
-# needs no cmake processing
-#add_subdirectory(cf)
summary()
if(PREBUILD_DIST)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-01-22 22:17:56
|
Revision: 9374
http://plplot.svn.sourceforge.net/plplot/?rev=9374&view=rev
Author: airwin
Date: 2009-01-22 22:16:26 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Minimum version of CMake is now 2.6.0.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2009-01-22 22:15:31 UTC (rev 9373)
+++ trunk/CMakeLists.txt 2009-01-22 22:16:26 UTC (rev 9374)
@@ -19,14 +19,9 @@
# along with PLplot; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-# Version 2.4.5 or above of cmake is required!
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
-# set CMake 2.6.x policy if the cmake_policy command exists, (i.e., if
-# the user is using CMake 2.6.0 or newer).
-if(COMMAND cmake_policy)
- # empty elements are not ignored in lists.
- cmake_policy(SET CMP0007 NEW)
-endif(COMMAND cmake_policy)
+# Version 2.6.0 or above of cmake is required!
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+cmake_policy(SET CMP0007 NEW)
# Recommended way to do user overrides of C-related variables, is given at
# http://public.kitware.com/pipermail/cmake/2006-July/010334.html.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-02-01 19:46:57
|
Revision: 9428
http://plplot.svn.sourceforge.net/plplot/?rev=9428&view=rev
Author: airwin
Date: 2009-02-01 19:46:54 +0000 (Sun, 01 Feb 2009)
Log Message:
-----------
No need to set specific policy anymore since we are using the 2.6.0
policy according to the documentation of what
cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
means (and partially confirmed by the new test loop that has been commented
out).
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2009-02-01 19:03:48 UTC (rev 9427)
+++ trunk/CMakeLists.txt 2009-02-01 19:46:54 UTC (rev 9428)
@@ -21,8 +21,12 @@
# Version 2.6.0 or above of cmake is required!
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
-cmake_policy(SET CMP0007 NEW)
+#foreach(policy RANGE 0 9)
+# cmake_policy(GET CMP000${policy} policy_result)
+# message(STATUS "Policy CMP000${policy} is ${policy_result}")
+#endforeach(policy RANGE 0 9)
+
# Recommended way to do user overrides of C-related variables, is given at
# http://public.kitware.com/pipermail/cmake/2006-July/010334.html.
# See also, CMakeCInformation.cmake. There are also C++, and Fortran-specific
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-04-22 17:17:37
|
Revision: 9828
http://plplot.svn.sourceforge.net/plplot/?rev=9828&view=rev
Author: airwin
Date: 2009-04-22 17:17:11 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
Output CMake version before doing anything else. Also, set minimum version
to 2.6.3 for MSYS. The minimum version for all other platforms remains at
2.6.0.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2009-04-22 04:22:17 UTC (rev 9827)
+++ trunk/CMakeLists.txt 2009-04-22 17:17:11 UTC (rev 9828)
@@ -19,8 +19,14 @@
# along with PLplot; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-# Version 2.6.0 or above of cmake is required!
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+message(STATUS "CMake version = ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
+if(MSYS)
+ # Version 2.6.3 or above of cmake is required for MSYS
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+else(MSYS)
+ # Version 2.6.0 or above of cmake is required for all other platforms
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+endif(MSYS)
#foreach(policy RANGE 0 9)
# cmake_policy(GET CMP000${policy} policy_result)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2009-04-24 04:37:17
|
Revision: 9841
http://plplot.svn.sourceforge.net/plplot/?rev=9841&view=rev
Author: arjenmarkus
Date: 2009-04-24 04:37:14 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
Moved the check on the minimum CMake version for MSYS to after the call to project(), as that seems to be the first moment in the build process that the variable is actually known.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2009-04-23 22:10:10 UTC (rev 9840)
+++ trunk/CMakeLists.txt 2009-04-24 04:37:14 UTC (rev 9841)
@@ -28,6 +28,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
endif(MSYS)
+
#foreach(policy RANGE 0 9)
# cmake_policy(GET CMP000${policy} policy_result)
# message(STATUS "Policy CMP000${policy} is ${policy_result}")
@@ -46,6 +47,12 @@
project(plplot)
+# For use under MSYS version 2.6.3 or above of cmake is required!
+# The variable MSYS is first known at this point in the build process
+IF(MSYS)
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+ENDIF(MSYS)
+
set(PACKAGE plplot)
# Location where PLplot cmake build system first looks for cmake modules.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-04-24 05:40:16
|
Revision: 9842
http://plplot.svn.sourceforge.net/plplot/?rev=9842&view=rev
Author: airwin
Date: 2009-04-24 05:39:57 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
Move entire check for CMake minimum version after the project file to
accomodate MSYS needs.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2009-04-24 04:37:14 UTC (rev 9841)
+++ trunk/CMakeLists.txt 2009-04-24 05:39:57 UTC (rev 9842)
@@ -19,21 +19,6 @@
# along with PLplot; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-message(STATUS "CMake version = ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
-if(MSYS)
- # Version 2.6.3 or above of cmake is required for MSYS
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
-else(MSYS)
- # Version 2.6.0 or above of cmake is required for all other platforms
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
-endif(MSYS)
-
-
-#foreach(policy RANGE 0 9)
-# cmake_policy(GET CMP000${policy} policy_result)
-# message(STATUS "Policy CMP000${policy} is ${policy_result}")
-#endforeach(policy RANGE 0 9)
-
# Recommended way to do user overrides of C-related variables, is given at
# http://public.kitware.com/pipermail/cmake/2006-July/010334.html.
# See also, CMakeCInformation.cmake. There are also C++, and Fortran-specific
@@ -49,10 +34,20 @@
# For use under MSYS version 2.6.3 or above of cmake is required!
# The variable MSYS is first known at this point in the build process
-IF(MSYS)
+message(STATUS "CMake version = ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
+if(MSYS)
+ # Version 2.6.3 or above of cmake is required for MSYS
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
-ENDIF(MSYS)
+else(MSYS)
+ # Version 2.6.0 or above of cmake is required for all other platforms
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+endif(MSYS)
+#foreach(policy RANGE 0 9)
+# cmake_policy(GET CMP000${policy} policy_result)
+# message(STATUS "Policy CMP000${policy} is ${policy_result}")
+#endforeach(policy RANGE 0 9)
+
set(PACKAGE plplot)
# Location where PLplot cmake build system first looks for cmake modules.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-03-21 00:43:53
|
Revision: 10875
http://plplot.svn.sourceforge.net/plplot/?rev=10875&view=rev
Author: airwin
Date: 2010-03-21 00:43:45 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Use the recommended (but not tested yet) command
set(CPACK_SET_DESTDIR ON)
Apparently this fix is necessary to be able to generate binary distributions
of PLplot because of the absolute locations we use for our install locations.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2010-03-18 20:23:49 UTC (rev 10874)
+++ trunk/CMakeLists.txt 2010-03-21 00:43:45 UTC (rev 10875)
@@ -222,6 +222,7 @@
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Scientific Plotting Library PLplot")
set(CPACK_PACKAGE_VENDOR "PLplot development team")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README)
+set(CPACK_SET_DESTDIR ON)
if(WIN32)
set(CPACK_GENERATOR ZIP)
else(WIN32)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-06-16 17:39:52
|
Revision: 11073
http://plplot.svn.sourceforge.net/plplot/?rev=11073&view=rev
Author: airwin
Date: 2010-06-16 17:39:45 +0000 (Wed, 16 Jun 2010)
Log Message:
-----------
utils subdirectory must be processed before examples so that pltcl target
is available for the tests that are run in examples.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2010-06-16 16:35:28 UTC (rev 11072)
+++ trunk/CMakeLists.txt 2010-06-16 17:39:45 UTC (rev 11073)
@@ -154,8 +154,8 @@
add_subdirectory(data)
add_subdirectory(bindings)
add_subdirectory(drivers)
+add_subdirectory(utils)
add_subdirectory(examples)
-add_subdirectory(utils)
add_subdirectory(plplot_test)
add_subdirectory(scripts)
add_subdirectory(doc)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-08-12 15:01:13
|
Revision: 11126
http://plplot.svn.sourceforge.net/plplot/?rev=11126&view=rev
Author: airwin
Date: 2010-08-12 15:01:04 +0000 (Thu, 12 Aug 2010)
Log Message:
-----------
Bump minimum version of CMake to 2.6.4 for all platforms. (Previous
minimum version was 2.6.3 for Windows and 2.6.0 for all other
platforms.)
There are two reasons for this change.
(1) I need "if(TARGET...." capability for all platforms which was
first introduced for 2.6.2.
(2) 2.6.4 has been readily available for a long time and
is very likely the minimum version of CMake we test any more.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2010-08-05 22:19:18 UTC (rev 11125)
+++ trunk/CMakeLists.txt 2010-08-12 15:01:04 UTC (rev 11126)
@@ -37,17 +37,14 @@
# examples are disabled.
project(plplot C)
-# For use under MSYS version 2.6.3 or above of cmake is required!
-# The variable MSYS is first known at this point in the build process
message(STATUS "CMake version = ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
-if(MSYS)
- # Version 2.6.3 or above of cmake is required for MSYS
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
-else(MSYS)
- # Version 2.6.0 or above of cmake is required for all other platforms
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
-endif(MSYS)
+# Note that the variable MSYS is first known at this point in the
+# build process in case have different minimum version for that case.
+
+# Version 2.6.4 or above of cmake is currently required for all platforms.
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR)
+
#foreach(policy RANGE 0 9)
# cmake_policy(GET CMP000${policy} policy_result)
# message(STATUS "Policy CMP000${policy} is ${policy_result}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-09-10 22:29:22
|
Revision: 11163
http://plplot.svn.sourceforge.net/plplot/?rev=11163&view=rev
Author: airwin
Date: 2010-09-10 22:29:16 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Configure abi-compliance-checker.template(.in) so that the configured
template file is aware of and uses certain CMake variables.
White space.
Lower-case command names.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2010-09-10 22:20:26 UTC (rev 11162)
+++ trunk/CMakeLists.txt 2010-09-10 22:29:16 UTC (rev 11163)
@@ -26,9 +26,9 @@
# one file so I use the overall variable CMAKE_USER_MAKE_RULES_OVERRIDE
# instead.
set(
-CMAKE_USER_MAKE_RULES_OVERRIDE
-${CMAKE_SOURCE_DIR}/cmake/UserOverride.cmake
-)
+ CMAKE_USER_MAKE_RULES_OVERRIDE
+ ${CMAKE_SOURCE_DIR}/cmake/UserOverride.cmake
+ )
# It is a fatal error if no working C compiler is available to build
# the PLplot core C library and core C examples. All other compilers
@@ -43,7 +43,7 @@
# build process in case have different minimum version for that case.
# Version 2.6.4 or above of cmake is currently required for all platforms.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
#foreach(policy RANGE 0 9)
# cmake_policy(GET CMP000${policy} policy_result)
@@ -58,29 +58,29 @@
${PROJECT_SOURCE_DIR}/cmake/modules
${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake
${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake-2.6
- )
+ )
else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
set(CMAKE_MODULE_PATH
${PROJECT_SOURCE_DIR}/cmake/modules
${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake
${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake-2.8
- )
+ )
endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
# We need the path to the MinGW/Borland compiler in order to find
# the import libraries for system libraries.
-IF(MINGW)
- get_filename_component(MINGWBINPATH ${CMAKE_C_COMPILER} PATH)
- set(MINGWLIBPATH ${MINGWBINPATH}/../lib
- CACHE FILEPATH
- DOCSTRING "Path to MinGW import libraries")
-ENDIF(MINGW)
-IF(BORLAND)
- get_filename_component(BORLANDBINPATH ${CMAKE_C_COMPILER} PATH)
- set(BORLANDLIBPATH ${BORLANDBINPATH}/../Lib/PSDK
- CACHE FILEPATH
- DOCSTRING "Path to Borland import libraries")
-ENDIF(BORLAND)
+if(MINGW)
+ get_filename_component(MINGWBINPATH ${CMAKE_C_COMPILER} PATH)
+ set(MINGWLIBPATH ${MINGWBINPATH}/../lib
+ CACHE FILEPATH
+ DOCSTRING "Path to MinGW import libraries")
+endif(MINGW)
+if(BORLAND)
+ get_filename_component(BORLANDBINPATH ${CMAKE_C_COMPILER} PATH)
+ set(BORLANDLIBPATH ${BORLANDBINPATH}/../Lib/PSDK
+ CACHE FILEPATH
+ DOCSTRING "Path to Borland import libraries")
+endif(BORLAND)
# Version data that need modification for each release.
include(plplot_version)
@@ -92,47 +92,55 @@
# Use configured variables to process configurable top-level files.
+# This CMake-configured template file is processed further by sed for
+# abi-compliance-checker.
configure_file(
-${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
-${CMAKE_CURRENT_BINARY_DIR}/config.h
-)
+ ${CMAKE_CURRENT_SOURCE_DIR}/abi-compliance-checker.xml.template.in
+ ${CMAKE_CURRENT_BINARY_DIR}/abi-compliance-checker.xml.template
+ @ONLY
+ )
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
+ )
# Allow access to the generated config.h for this build.
-ADD_DEFINITIONS("-DHAVE_CONFIG_H")
+add_definitions("-DHAVE_CONFIG_H")
# Install top-level files
# Enable testing framework for examples
-if (BUILD_TEST)
+if(BUILD_TEST)
include(CTest)
-endif (BUILD_TEST)
+endif(BUILD_TEST)
# Disable warnings about deprecated functions (Visual C++ 2005)
if(MSVC_VERSION GREATER 1399)
- ADD_DEFINITIONS("/D_CRT_SECURE_NO_DEPRECATE")
+ add_definitions("/D_CRT_SECURE_NO_DEPRECATE")
endif(MSVC_VERSION GREATER 1399)
# in windows all created dlls are gathered in the dll directory
# if you add this directory to your PATH all shared libraries are available
if(BUILD_SHARED_LIBS AND WIN32 AND NOT CYGWIN)
- SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dll)
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dll)
endif(BUILD_SHARED_LIBS AND WIN32 AND NOT CYGWIN)
# Borland Compiler must compile in ANSII mode
if(BORLAND)
- ADD_DEFINITIONS(-A)
+ add_definitions(-A)
endif(BORLAND)
set(top_level_DOCFILES
-AUTHORS
-COPYING.LIB
-ChangeLog
-Copyright
-FAQ
-NEWS
-PROBLEMS
-README
-README.release
-README.testing
-)
+ AUTHORS
+ COPYING.LIB
+ ChangeLog
+ Copyright
+ FAQ
+ NEWS
+ PROBLEMS
+ README
+ README.release
+ README.testing
+ )
install(FILES ${top_level_DOCFILES} DESTINATION ${DOC_DIR})
# Process other directories including using configured variables to
@@ -168,9 +176,9 @@
# N.B. the plhershey-unicode.h_built target has to be pre-built only because
# of the needs of the old windows build at sys/win32/msdev.
set(
- DIST_TARGETS
- plhershey-unicode.h_built
- )
+ DIST_TARGETS
+ plhershey-unicode.h_built
+ )
if(ENABLE_octave)
set(DIST_TARGETS ${DIST_TARGETS} make_documentation)
@@ -197,18 +205,18 @@
else(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
# copy prebuilds back to source tree.
add_custom_target(
- prebuild_dist
- COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_BINARY_DIR}/include/plhershey-unicode.h
- ${CMAKE_SOURCE_DIR}/include
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
- ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
- COMMAND cp
- `cat static_built_files ${INFO_MANIFEST} ${MAN_MANIFEST} ${HTML_MANIFEST}`
- ${CMAKE_SOURCE_DIR}/doc/docbook/src
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc/docbook/src
- )
+ prebuild_dist
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_BINARY_DIR}/include/plhershey-unicode.h
+ ${CMAKE_SOURCE_DIR}/include
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
+ ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
+ COMMAND cp
+ `cat static_built_files ${INFO_MANIFEST} ${MAN_MANIFEST} ${HTML_MANIFEST}`
+ ${CMAKE_SOURCE_DIR}/doc/docbook/src
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc/docbook/src
+ )
endif(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
add_dependencies(prebuild_dist ${DIST_TARGETS})
endif(PREBUILD_DIST)
@@ -226,34 +234,33 @@
set(CPACK_GENERATOR TGZ)
endif(WIN32)
set(
-CPACK_SOURCE_PACKAGE_FILE_NAME
-"plplot-${VERSION}"
-CACHE INTERNAL "tarball basename"
-)
+ CPACK_SOURCE_PACKAGE_FILE_NAME
+ "plplot-${VERSION}"
+ CACHE INTERNAL "tarball basename"
+ )
set(CPACK_SOURCE_GENERATOR TGZ)
# The following components are regex's to match anywhere (unless anchored)
# in absolute path + filename to find files or directories to be excluded
# from source tarball.
set(CPACK_SOURCE_IGNORE_FILES
-"~$"
-"\\\\.cvsignore$"
-"^${PROJECT_SOURCE_DIR}.*/\\\\.svn/"
-"^${PROJECT_SOURCE_DIR}/old/"
-"^${PROJECT_SOURCE_DIR}/sys/mac"
-"^${PROJECT_SOURCE_DIR}/sys/os2"
-"^${PROJECT_SOURCE_DIR}/sys/unix"
-"^${PROJECT_SOURCE_DIR}/sys/dos/msc"
-"^${PROJECT_SOURCE_DIR}/sys/dos/bcc"
-"^${PROJECT_SOURCE_DIR}/sys/dos/emx"
-"^${PROJECT_SOURCE_DIR}/sys/win-tk"
-"^${PROJECT_SOURCE_DIR}/sys/win32"
-)
+ "~$"
+ "\\\\.cvsignore$"
+ "^${PROJECT_SOURCE_DIR}.*/\\\\.svn/"
+ "^${PROJECT_SOURCE_DIR}/old/"
+ "^${PROJECT_SOURCE_DIR}/sys/mac"
+ "^${PROJECT_SOURCE_DIR}/sys/os2"
+ "^${PROJECT_SOURCE_DIR}/sys/unix"
+ "^${PROJECT_SOURCE_DIR}/sys/dos/msc"
+ "^${PROJECT_SOURCE_DIR}/sys/dos/bcc"
+ "^${PROJECT_SOURCE_DIR}/sys/dos/emx"
+ "^${PROJECT_SOURCE_DIR}/sys/win-tk"
+ "^${PROJECT_SOURCE_DIR}/sys/win32"
+ )
#message("CPACK_SOURCE_IGNORE_FILES = ${CPACK_SOURCE_IGNORE_FILES}")
include(CPack)
# Path to native build for executables required in the build process.
# This is only required for cross compiling
-if (CMAKE_CROSSCOMPILING)
+if(CMAKE_CROSSCOMPILING)
set(CMAKE_NATIVE_BINARY_DIR NATIVEDIR-NOTFOUND CACHE FILEPATH "Point to the native build directory")
-endif (CMAKE_CROSSCOMPILING)
-
+endif(CMAKE_CROSSCOMPILING)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-11-21 20:41:40
|
Revision: 11340
http://plplot.svn.sourceforge.net/plplot/?rev=11340&view=rev
Author: airwin
Date: 2010-11-21 20:41:33 +0000 (Sun, 21 Nov 2010)
Log Message:
-----------
Maintain DIST_TARGETS, the list of prebuilt targets to be distributed
with the source tarball.
a. Remove plhershey-unicode.h_built from DIST_TARGETS because that was
only needed for old windows build at sys/win32/msdev which has been
removed.
b. Add build_doxygen to DIST_TARGETS.
Maintain the prebuild_dist target which copies files/directories
back to the source tree so they can be distributed with the source
tarball.
a. Remove plhershey-unicode.h file from those being copied since only
needed for old windows build at sys/win32/msdev which has been
removed.
b. Do better job of copying octave/plplot_octave_txt directory (i.e.,
remove directory if it is there in the source tree before copying
from the build tree.
c. Add doc/doxygen directory to those being copied.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2010-11-21 20:24:54 UTC (rev 11339)
+++ trunk/CMakeLists.txt 2010-11-21 20:41:33 UTC (rev 11340)
@@ -173,45 +173,50 @@
# the source tree (if build tree is different from source tree).
# List of targets that must be (pre-)built.
- # N.B. the plhershey-unicode.h_built target has to be pre-built only because
- # of the needs of the old windows build at sys/win32/msdev.
- set(
- DIST_TARGETS
- plhershey-unicode.h_built
- )
+ set(DIST_TARGETS)
if(ENABLE_octave)
- set(DIST_TARGETS ${DIST_TARGETS} make_documentation)
+ list(APPEND DIST_TARGETS make_documentation)
endif(ENABLE_octave)
if(BUILD_PRINT)
- set(DIST_TARGETS ${DIST_TARGETS} print)
+ list(APPEND DIST_TARGETS print)
endif(BUILD_PRINT)
if(BUILD_INFO)
- set(DIST_TARGETS ${DIST_TARGETS} info)
+ list(APPEND DIST_TARGETS info)
endif(BUILD_INFO)
if(BUILD_MAN)
- set(DIST_TARGETS ${DIST_TARGETS} man)
+ list(APPEND DIST_TARGETS man)
endif(BUILD_MAN)
if(BUILD_HTML)
- set(DIST_TARGETS ${DIST_TARGETS} html)
+ list(APPEND DIST_TARGETS html)
endif(BUILD_HTML)
+ if(BUILD_DOX_DOC)
+ list(APPEND DIST_TARGETS build_doxygen)
+ endif(BUILD_DOX_DOC)
+
if(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
add_custom_target(prebuild_dist)
else(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
# copy prebuilds back to source tree.
+ # N.B. copy_directory quietly creates an empty directory with no
+ # error condition if the source directory does not exist.
add_custom_target(
prebuild_dist
- COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_BINARY_DIR}/include/plhershey-unicode.h
- ${CMAKE_SOURCE_DIR}/include
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
+ ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
+ COMMAND ${CMAKE_COMMAND} -E remove_directory
+ ${CMAKE_SOURCE_DIR}/doc/doxygen
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${CMAKE_BINARY_DIR}/doc/doxygen
+ ${CMAKE_SOURCE_DIR}/doc/doxygen
COMMAND cp
`cat static_built_files ${INFO_MANIFEST} ${MAN_MANIFEST} ${HTML_MANIFEST}`
${CMAKE_SOURCE_DIR}/doc/docbook/src
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hba...@us...> - 2011-08-01 18:32:47
|
Revision: 11837
http://plplot.svn.sourceforge.net/plplot/?rev=11837&view=rev
Author: hbabcock
Date: 2011-08-01 18:32:41 +0000 (Mon, 01 Aug 2011)
Log Message:
-----------
Update CMakeLists file to reflect ChangeLog -> ChangeLog.release renaming
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-08-01 18:31:54 UTC (rev 11836)
+++ trunk/CMakeLists.txt 2011-08-01 18:32:41 UTC (rev 11837)
@@ -130,9 +130,10 @@
endif(BORLAND)
set(top_level_DOCFILES
+ ABOUT
AUTHORS
COPYING.LIB
- ChangeLog
+ ChangeLog.release
Copyright
FAQ
NEWS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2011-08-12 09:42:23
|
Revision: 11875
http://plplot.svn.sourceforge.net/plplot/?rev=11875&view=rev
Author: andrewross
Date: 2011-08-12 09:42:17 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
Don't ship the debian/ directory in source tarball releases since this is unlikely to actually be the debian setup required for the release. This follows Debian recommended practice.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-08-12 09:10:30 UTC (rev 11874)
+++ trunk/CMakeLists.txt 2011-08-12 09:42:17 UTC (rev 11875)
@@ -261,6 +261,7 @@
"^${PROJECT_SOURCE_DIR}/sys/dos/emx"
"^${PROJECT_SOURCE_DIR}/sys/win-tk"
"^${PROJECT_SOURCE_DIR}/sys/win32"
+ "^${PROJECT_SOURCE_DIR}/debian"
)
#message("CPACK_SOURCE_IGNORE_FILES = ${CPACK_SOURCE_IGNORE_FILES}")
include(CPack)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-09-15 01:18:02
|
Revision: 11925
http://plplot.svn.sourceforge.net/plplot/?rev=11925&view=rev
Author: airwin
Date: 2011-09-15 01:17:51 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Eliminate #*# files from tarballs that are sometimes left over from
interrupted edit sessions. One test case (for another project) has been
tried to insure this particular regex pattern does the job.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-09-14 14:23:22 UTC (rev 11924)
+++ trunk/CMakeLists.txt 2011-09-15 01:17:51 UTC (rev 11925)
@@ -249,6 +249,7 @@
# in absolute path + filename to find files or directories to be excluded
# from source tarball.
set(CPACK_SOURCE_IGNORE_FILES
+ "\\\\#*\\\\#$"
"~$"
"\\\\.cvsignore$"
"^${PROJECT_SOURCE_DIR}.*/\\\\.svn/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-10-26 22:37:01
|
Revision: 12000
http://plplot.svn.sourceforge.net/plplot/?rev=12000&view=rev
Author: airwin
Date: 2011-10-26 22:36:55 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
Bump minimum version of CMake to 2.8.2 for Linux and 2.8.6 for
all other platforms as discussed on the plplot-devel mailing list.
I have just confirmed that CMake-2.8.6 gives good results on Linux
(using the ctest test), but that also needs to be tested on our other
platforms. As soon as that platform testing is complete, I plan to
remove the CMake-2.6.x logic and files that are currently part of our
build system.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-10-21 12:37:41 UTC (rev 11999)
+++ trunk/CMakeLists.txt 2011-10-26 22:36:55 UTC (rev 12000)
@@ -38,13 +38,25 @@
project(plplot C)
message(STATUS "CMake version = ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
+message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
-# Note that the variable MSYS is first known at this point in the
-# build process in case have different minimum version for that case.
+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
+ # software releases of software that PLplot depends on than earlier versions.
+ # However, as a special concession to our modern (not enterprise or
+ # LTS) Linux distro users so they can avoid a download of recent CMake,
+ # we allow them to use the system version of
+ # CMake which at this time (2011-10) is typically 2.8.2 or later.
+ cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
+else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ # For non-Linux platforms we prefer to support only the most recent
+ # CMake version since that tends to be most free of issues and most
+ # consistent with releases of software that PLplot depends on. The
+ # most recently released CMake is 2.8.6 at this time (2011-10).
+ cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
+endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-# Version 2.6.4 or above of cmake is currently required for all platforms.
-cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)
-
#foreach(policy RANGE 0 9)
# cmake_policy(GET CMP000${policy} policy_result)
# message(STATUS "Policy CMP000${policy} is ${policy_result}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-10 15:58:12
|
Revision: 12413
http://sourceforge.net/p/plplot/code/12413
Author: airwin
Date: 2013-07-10 15:58:05 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Replace WIN32 with an unambiguous name for that variable.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-07-10 04:32:13 UTC (rev 12412)
+++ trunk/CMakeLists.txt 2013-07-10 15:58:05 UTC (rev 12413)
@@ -59,6 +59,8 @@
# Force CMake to _NOT_ define 'WIN32' on Cygwin
set(CMAKE_LEGACY_CYGWIN_WIN32 OFF)
+
+# Set unambiguous names for these variables as a reminder.
set(WIN32_AND_NOT_CYGWIN ${WIN32})
if(WIN32 OR CYGWIN)
set(WIN32_OR_CYGWIN ON)
@@ -133,9 +135,9 @@
# in windows all created dlls are gathered in the dll directory
# if you add this directory to your PATH all shared libraries are available
-if(BUILD_SHARED_LIBS AND WIN32)
+if(BUILD_SHARED_LIBS AND WIN32_AND_NOT_CYGWIN)
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dll)
-endif(BUILD_SHARED_LIBS AND WIN32)
+endif(BUILD_SHARED_LIBS AND WIN32_AND_NOT_CYGWIN)
# Borland Compiler must compile in ANSII mode
if(BORLAND)
@@ -247,11 +249,11 @@
set(CPACK_PACKAGE_VENDOR "PLplot development team")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README)
set(CPACK_SET_DESTDIR ON)
-if(WIN32)
+if(WIN32_AND_NOT_CYGWIN)
set(CPACK_GENERATOR ZIP)
-else(WIN32)
+else(WIN32_AND_NOT_CYGWIN)
set(CPACK_GENERATOR TGZ)
-endif(WIN32)
+endif(WIN32_AND_NOT_CYGWIN)
set(
CPACK_SOURCE_PACKAGE_FILE_NAME
"plplot-${VERSION}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-12 18:08:05
|
Revision: 12419
http://sourceforge.net/p/plplot/code/12419
Author: airwin
Date: 2013-07-12 18:08:01 +0000 (Fri, 12 Jul 2013)
Log Message:
-----------
Follow the build of CMake itself so that the initial order of commands is
cmake_minimum_required(...
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(...
This reordering should (hopefully) solve a current Cygwin issue where
there is a warning about CMAKE_LEGACY_CYGWIN_WIN32 not being set.
This reordering means that the variable CMAKE_SYSTEM_NAME is not
defined when cmake_minimum_required is called so we must use the same
minimum CMake version for all platforms. In retrospect this is a good
thing since the value of the minimum version sets a number of CMake
policies, and we want those policies (how CMake logic is interpreted)
to be identical on all platforms.
I also took this opportunity to update the minimum version from 2.8.2
on Linux and 2.8.6 on all other platforms to a uniform 2.8.9. I chose
that minimum to be consistent with the CMake version available on
Debian Wheezy (released a few months ago, and typically more
conservative about CMake versions than other modern Linux
distributions). What this means is modern Linux distribution users
(and presumably users of modern Mac versions) should be able to build
PLplot without having to build or download a modern CMake version as
well. As always, Windows users and legacy Linux distribution users
will have to download a binary CMake or build CMake with
a version that satisifies the version requirements (currently 2.8.9).
Tested by: Alan W. Irwin <ai...@us...> using the
install target (for -DBUILD_TEST=ON) and also by running ctest.
Note, I view this testing as the minimum acceptable for such a
fundamental build-system change where some of the CMake policies
(interpretations of CMake logic) have been updated on Linux from those
policies in effect for 2.8.2 to the policies in effect for 2.8.9.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-07-11 20:29:33 UTC (rev 12418)
+++ trunk/CMakeLists.txt 2013-07-12 18:08:01 UTC (rev 12419)
@@ -30,6 +30,11 @@
${CMAKE_SOURCE_DIR}/cmake/UserOverride.cmake
)
+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
+
+# Force CMake to _NOT_ define 'WIN32' on Cygwin
+set(CMAKE_LEGACY_CYGWIN_WIN32 0)
+
# It is a fatal error if no working C compiler is available to build
# the PLplot core C library and core C examples. All other compilers
# required by our bindings are optional in that if no working compiler
@@ -40,26 +45,6 @@
message(STATUS "CMake version = ${CMAKE_VERSION}")
message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
-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
- # software releases of software that PLplot depends on than earlier versions.
- # However, as a special concession to our modern (not enterprise or
- # LTS) Linux distro users so they can avoid a download of recent CMake,
- # we allow them to use the system version of
- # CMake which at this time (2011-10) is typically 2.8.2 or later.
- cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
-else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- # For non-Linux platforms we prefer to support only the most recent
- # CMake version since that tends to be most free of issues and most
- # consistent with releases of software that PLplot depends on. The
- # most recently released CMake is 2.8.6 at this time (2011-10).
- cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
-endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
-# Force CMake to _NOT_ define 'WIN32' on Cygwin
-set(CMAKE_LEGACY_CYGWIN_WIN32 OFF)
-
# Set unambiguous names for these variables as a reminder.
set(WIN32_AND_NOT_CYGWIN ${WIN32})
if(WIN32 OR CYGWIN)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-16 16:42:35
|
Revision: 12425
http://sourceforge.net/p/plplot/code/12425
Author: airwin
Date: 2013-07-16 16:42:32 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Drop "set(CMAKE_LEGACY_CYGWIN_WIN32 0)" to follow the directions
precisely which are that you should only set that variable if the
minimum version (currently 2.8.9) is less than 2.8.4.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-07-15 19:43:05 UTC (rev 12424)
+++ trunk/CMakeLists.txt 2013-07-16 16:42:32 UTC (rev 12425)
@@ -32,9 +32,6 @@
cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
-# Force CMake to _NOT_ define 'WIN32' on Cygwin
-set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-
# It is a fatal error if no working C compiler is available to build
# the PLplot core C library and core C examples. All other compilers
# required by our bindings are optional in that if no working compiler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-07 19:37:45
|
Revision: 12825
http://sourceforge.net/p/plplot/code/12825
Author: airwin
Date: 2013-12-07 19:37:42 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
Suppress warning messages concerning policies CMP0022 and CMP0023 that
are generated by CMake-2.8.12 and higher. This is a temporary measure
that is required until we bump the minimum version to 2.8.12.1 or
higher and fix the resulting build-system errors which will require
moving from the old LINK_INTERFACE_LIBRARIES method to the modern
INTERFACE_LINK_LIBRARIES method (implemented badly in 2.8.12 and
implemented correctly for the first time in 2.8.12.1).
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-12-07 06:54:18 UTC (rev 12824)
+++ trunk/CMakeLists.txt 2013-12-07 19:37:42 UTC (rev 12825)
@@ -32,6 +32,29 @@
cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
+# cmake-2.8.12.1 (2.8.12 screwed up the implementation) introduced a
+# corrected implementation of keyword signatures for
+# target_link_libraries which are preferred now over the traditional
+# plain signatures. There are a lot of implications concerning these
+# preferred keyword signatures which I don't understand at the moment,
+# but it is clear some modifications to our build system will be
+# required to start using keyword signatures appropriately. But it is
+# also clear we can do nothing about this until we can guarantee that
+# all our users are running 2.8.12.1 or higher. Therefore, until we
+# bump the actual minimum version to 2.8.12.1 in the above
+# cmake_minimum_required call and deal with all the errors in our
+# CMake code that will generate, quiet the warnings about this issue
+# by explicitly setting policies CMP0022 and CMP0023 (if they exist
+# for whatever CMake version the user is running) to OLD.
+if(POLICY CMP0022)
+ message(STATUS "Explicitly setting policy CMP0022 to OLD")
+ cmake_policy(SET CMP0022 OLD)
+endif(POLICY CMP0022)
+if(POLICY CMP0023)
+ message(STATUS "Explicitly setting policy CMP0023 to OLD")
+ cmake_policy(SET CMP0023 OLD)
+endif(POLICY CMP0023)
+
# It is a fatal error if no working C compiler is available to build
# the PLplot core C library and core C examples. All other compilers
# required by our bindings are optional in that if no working compiler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-29 18:18:48
|
Revision: 13113
http://sourceforge.net/p/plplot/code/13113
Author: airwin
Date: 2014-04-29 18:18:45 +0000 (Tue, 29 Apr 2014)
Log Message:
-----------
Improved regex for dropping emacs temporary files from release tarball.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2014-04-26 02:43:54 UTC (rev 13112)
+++ trunk/CMakeLists.txt 2014-04-29 18:18:45 UTC (rev 13113)
@@ -270,7 +270,7 @@
# in absolute path + filename to find files or directories to be excluded
# from source tarball.
set(CPACK_SOURCE_IGNORE_FILES
- "\\\\#*\\\\#$"
+ "\\\\#.*$"
"~$"
"\\\\.cvsignore$"
"^${PROJECT_SOURCE_DIR}.*/\\\\.svn/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X