Revision: 65562
http://sourceforge.net/p/brlcad/code/65562
Author: starseeker
Date: 2015-07-10 20:41:09 +0000 (Fri, 10 Jul 2015)
Log Message:
-----------
Remove a slew of (probably) unnecessary policy settings from the src/other
build files that we're managing ourselves - only add in what proves to be
necessary, particularly when set to OLD.
Modified Paths:
--------------
brlcad/trunk/src/other/PoissonRecon/CMakeLists.txt
brlcad/trunk/src/other/URToolkit/CMakeLists.txt
brlcad/trunk/src/other/gct/CMakeLists.txt
brlcad/trunk/src/other/incrTcl/itcl/CMakeLists.txt
brlcad/trunk/src/other/incrTcl/itk/CMakeLists.txt
brlcad/trunk/src/other/libgdiam/CMakeLists.txt
brlcad/trunk/src/other/libtermlib/CMakeLists.txt
brlcad/trunk/src/other/libutahrle/CMakeLists.txt
brlcad/trunk/src/other/libvds/CMakeLists.txt
brlcad/trunk/src/other/openNURBS/CMakeLists.txt
brlcad/trunk/src/other/poly2tri/CMakeLists.txt
brlcad/trunk/src/other/rply/CMakeLists.txt
brlcad/trunk/src/other/stepcode/CMakeLists.txt
brlcad/trunk/src/other/tkhtml/CMakeLists.txt
brlcad/trunk/src/other/tkpng/CMakeLists.txt
brlcad/trunk/src/other/tktable/CMakeLists.txt
Modified: brlcad/trunk/src/other/PoissonRecon/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/PoissonRecon/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/PoissonRecon/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -36,30 +36,7 @@
# Minimum required version of CMake
cmake_minimum_required(VERSION 2.8.4)
if(COMMAND CMAKE_POLICY)
- # libraries linked via full path don't introduce linker search paths
CMAKE_POLICY(SET CMP0003 NEW)
-
- # list command doesn't ignore empty elements
- CMAKE_POLICY(SET CMP0007 NEW)
-
- # prefer files in CMAKE_MODULE_PATH over the cmake module dir
- CMAKE_POLICY(SET CMP0017 OLD)
-
- # allow relative paths in INCLUDE_DIRECTORIES
- if ("${CMAKE_VERSION}" VERSION_EQUAL 2.8.12 OR "${CMAKE_VERSION}"
VERSION_GREATER 2.8.12)
- CMAKE_POLICY(SET CMP0021 OLD)
- endif ("${CMAKE_VERSION}" VERSION_EQUAL 2.8.12 OR "${CMAKE_VERSION}"
VERSION_GREATER 2.8.12)
-
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- CMAKE_POLICY(SET CMP0042 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-
- if ("${CMAKE_VERSION}" VERSION_GREATER 3.0.9)
- CMAKE_POLICY(SET CMP0046 NEW)
- CMAKE_POLICY(SET CMP0053 OLD)
- CMAKE_POLICY(SET CMP0054 NEW)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 3.0.9)
endif(COMMAND CMAKE_POLICY)
# set CMake project name
Modified: brlcad/trunk/src/other/URToolkit/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/URToolkit/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/URToolkit/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -1,9 +1,3 @@
-IF(COMMAND CMAKE_POLICY)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-ENDIF(COMMAND CMAKE_POLICY)
-
IF(NOT MSVC)
MACRO(URT_EXEC execname srcs)
STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
Modified: brlcad/trunk/src/other/gct/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/gct/CMakeLists.txt 2015-07-10 20:25:06 UTC (rev
65561)
+++ brlcad/trunk/src/other/gct/CMakeLists.txt 2015-07-10 20:41:09 UTC (rev
65562)
@@ -2,14 +2,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
if(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- CMAKE_POLICY(SET CMP0007 OLD)
- if("${CMAKE_VERSION}" VERSION_GREATER 2.8.3)
- CMAKE_POLICY(SET CMP0017 OLD)
- endif("${CMAKE_VERSION}" VERSION_GREATER 2.8.3)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}"
- VERSION_GREATER 2.99)
endif(COMMAND CMAKE_POLICY)
# set CMake project name
Modified: brlcad/trunk/src/other/incrTcl/itcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/incrTcl/itcl/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/incrTcl/itcl/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -40,10 +40,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- CMAKE_POLICY(SET CMP0048 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
ENDIF(COMMAND CMAKE_POLICY)
# set CMake project name
Modified: brlcad/trunk/src/other/incrTcl/itk/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/incrTcl/itk/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/incrTcl/itk/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -40,10 +40,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- CMAKE_POLICY(SET CMP0048 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
ENDIF(COMMAND CMAKE_POLICY)
# set CMake project name
Modified: brlcad/trunk/src/other/libgdiam/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libgdiam/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/libgdiam/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -2,9 +2,6 @@
cmake_minimum_required(VERSION 2.8)
if(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
endif(COMMAND CMAKE_POLICY)
# Set CMake project name
Modified: brlcad/trunk/src/other/libtermlib/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libtermlib/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/libtermlib/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -1,26 +1,23 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-IF(COMMAND CMAKE_POLICY)
- CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-ENDIF(COMMAND CMAKE_POLICY)
+cmake_minimum_required(VERSION 2.8)
+if(COMMAND CMAKE_POLICY)
+ cmake_policy(SET CMP0003 NEW)
+endif(COMMAND CMAKE_POLICY)
-PROJECT(LIBTERMLIB)
+project(LIBTERMLIB)
-IF(NOT MSVC)
+if(NOT MSVC)
if(NOT CONF_DIR)
set(CONF_DIR etc)
endif(NOT CONF_DIR)
- SET(LIBTERMLIB_PRIVATE_HDRS
+ set(LIBTERMLIB_PRIVATE_HDRS
termcap.h
)
- SET(LIBTERM_SOURCES
+ set(LIBTERM_SOURCES
termcap.c
tgoto.c
tputs.c
@@ -47,21 +44,21 @@
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
- SET_TARGET_PROPERTIES(termlib-static PROPERTIES OUTPUT_NAME "termlib")
+ set_target_properties(termlib-static PROPERTIES OUTPUT_NAME "termlib")
if (NOT CMAKE_CONFIGURATION_TYPES)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/termcap.src
${CMAKE_BINARY_DIR}/${CONF_DIR}/termcap COPYONLY)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/${CONF_DIR}/termcap DESTINATION
${CONF_DIR})
+ install(FILES ${CMAKE_BINARY_DIR}/${CONF_DIR}/termcap DESTINATION
${CONF_DIR})
else (NOT CMAKE_CONFIGURATION_TYPES)
foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/termcap.src
${CMAKE_BINARY_DIR}/${CFG_TYPE_UPPER}/${DATA_DIR}/etc/termcap COPYONLY)
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- INSTALL(FILES ${CMAKE_BINARY_DIR}/\${BUILD_TYPE}/${CONF_DIR}/termcap
DESTINATION ${CONF_DIR})
+ install(FILES ${CMAKE_BINARY_DIR}/\${BUILD_TYPE}/${CONF_DIR}/termcap
DESTINATION ${CONF_DIR})
endif (NOT CMAKE_CONFIGURATION_TYPES)
-ENDIF(NOT MSVC)
+endif(NOT MSVC)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/other/libutahrle/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libutahrle/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/libutahrle/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -1,8 +1,3 @@
-IF(COMMAND CMAKE_POLICY)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-ENDIF(COMMAND CMAKE_POLICY)
SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/CMake")
INCLUDE(UTAH_CheckFunctions)
Modified: brlcad/trunk/src/other/libvds/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libvds/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/libvds/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -1,7 +1,7 @@
##########################################################################
# Copyright 2011 United States Government as represented by the U.S.
# Army Research Laboratory.
-#
+#
# Copyright 1999 The University of Virginia.
# All Rights Reserved.
#
@@ -11,14 +11,14 @@
# complete text of this comment appear in all copies, and provided that
# the University of Virginia and the original authors are credited in
# any publications arising from the use of this software.
-#
-# IN NO EVENT SHALL THE UNIVERSITY OF VIRGINIA OR ANY AUTHOR OF THIS
-# SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
-# INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-# ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-# IF THE UNIVERSITY OF VIRGINIA AND/OR THE AUTHOR OF THIS SOFTWARE
+#
+# IN NO EVENT SHALL THE UNIVERSITY OF VIRGINIA OR ANY AUTHOR OF THIS
+# SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
+# INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+# ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+# IF THE UNIVERSITY OF VIRGINIA AND/OR THE AUTHOR OF THIS SOFTWARE
# HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-#
+#
##########################################################################
# This file contains the top level CMakeLists.txt logic for the
@@ -27,13 +27,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
if(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- CMAKE_POLICY(SET CMP0007 OLD)
- if("${CMAKE_VERSION}" VERSION_GREATER 2.8.3)
- CMAKE_POLICY(SET CMP0017 OLD)
- endif("${CMAKE_VERSION}" VERSION_GREATER 2.8.3)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
endif(COMMAND CMAKE_POLICY)
# set CMake project name
Modified: brlcad/trunk/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/openNURBS/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/openNURBS/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -1,9 +1,3 @@
-IF(COMMAND CMAKE_POLICY)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-ENDIF(COMMAND CMAKE_POLICY)
-
if(BRLCAD_FLAGS_DEBUG)
add_definitions(${DEBUG_CXX_FLAGS})
endif(BRLCAD_FLAGS_DEBUG)
Modified: brlcad/trunk/src/other/poly2tri/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/poly2tri/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/poly2tri/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -2,9 +2,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
if(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
endif(COMMAND CMAKE_POLICY)
# Set CMake project name
Modified: brlcad/trunk/src/other/rply/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/rply/CMakeLists.txt 2015-07-10 20:25:06 UTC (rev
65561)
+++ brlcad/trunk/src/other/rply/CMakeLists.txt 2015-07-10 20:41:09 UTC (rev
65562)
@@ -2,9 +2,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
if(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
endif(COMMAND CMAKE_POLICY)
# Set CMake project name
Modified: brlcad/trunk/src/other/stepcode/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/stepcode/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -54,9 +54,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
if ("${CMAKE_VERSION}" VERSION_GREATER 3.0.9)
CMAKE_POLICY(SET CMP0054 NEW)
endif ("${CMAKE_VERSION}" VERSION_GREATER 3.0.9)
Modified: brlcad/trunk/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tkhtml/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/tkhtml/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -2,9 +2,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
ENDIF(COMMAND CMAKE_POLICY)
# set CMake project name
Modified: brlcad/trunk/src/other/tkpng/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tkpng/CMakeLists.txt 2015-07-10 20:25:06 UTC (rev
65561)
+++ brlcad/trunk/src/other/tkpng/CMakeLists.txt 2015-07-10 20:41:09 UTC (rev
65562)
@@ -2,9 +2,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
ENDIF(COMMAND CMAKE_POLICY)
# set CMake project name
Modified: brlcad/trunk/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tktable/CMakeLists.txt 2015-07-10 20:25:06 UTC
(rev 65561)
+++ brlcad/trunk/src/other/tktable/CMakeLists.txt 2015-07-10 20:41:09 UTC
(rev 65562)
@@ -2,9 +2,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
- if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0026 OLD)
- endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
ENDIF(COMMAND CMAKE_POLICY)
# set CMake project name
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
