Revision: 70018
http://sourceforge.net/p/brlcad/code/70018
Author: starseeker
Date: 2017-07-29 02:41:32 +0000 (Sat, 29 Jul 2017)
Log Message:
-----------
We don't appear to actually be using the LOCATION property for anything in our
build of osg
Modified Paths:
--------------
brlcad/trunk/src/other/openscenegraph/CMakeLists.txt
brlcad/trunk/src/other/openscenegraph/CMakeModules/UtilityMacros.cmake
Modified: brlcad/trunk/src/other/openscenegraph/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/openscenegraph/CMakeLists.txt 2017-07-28
22:38:43 UTC (rev 70017)
+++ brlcad/trunk/src/other/openscenegraph/CMakeLists.txt 2017-07-29
02:41:32 UTC (rev 70018)
@@ -1,19 +1,8 @@
# Minimum required version of CMake
-cmake_minimum_required(VERSION 2.8.8)
-if(COMMAND CMAKE_POLICY)
- CMAKE_POLICY(SET CMP0003 NEW)
- CMAKE_POLICY(SET CMP0007 OLD)
- CMAKE_POLICY(SET CMP0017 OLD)
- if("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- CMAKE_POLICY(SET CMP0020 OLD)
- endif("${CMAKE_VERSION}" VERSION_GREATER 2.99)
- 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 3.0.2)
# set CMake project name
-PROJECT(OpenSceneGraph)
+project(OpenSceneGraph)
set(OPENSCENEGRAPH_MAJOR_VERSION 3)
set(OPENSCENEGRAPH_MINOR_VERSION 2)
Modified: brlcad/trunk/src/other/openscenegraph/CMakeModules/UtilityMacros.cmake
===================================================================
--- brlcad/trunk/src/other/openscenegraph/CMakeModules/UtilityMacros.cmake
2017-07-28 22:38:43 UTC (rev 70017)
+++ brlcad/trunk/src/other/openscenegraph/CMakeModules/UtilityMacros.cmake
2017-07-29 02:41:32 UTC (rev 70018)
@@ -102,23 +102,6 @@
ENDMACRO()
#---------------------------------------------------
-# Macro: TARGET_LOCATIONS_ACCUM TARGET_NAME
-#
-#---------------------------------------------------
-
-MACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME)
- IF(ACCUM_FILE_TARGETS)
- IF(EXISTS ${ACCUM_FILE_TARGETS})
- GET_TARGET_PROPERTY(_FILE_LOCATION ${TARGET_NAME} LOCATION)
- FILE(APPEND ${ACCUM_FILE_TARGETS} "${_FILE_LOCATION};")
- #SET(_TARGETS_LIST ${_TARGETS_LIST} "${_FILE_LOCATION}" CACHE
INTERNAL "lista dll")
- #MESSAGE("adding target -->${TARGET_NAME}<-- file
-->${_FILE_LOCATION}<-- to list -->${_TARGETS_LIST}<--")
- #SET(ACCUM_FILE_TARGETS ${ACCUM_FILE_TARGETS} ${_FILE_LOCATION})
- ENDIF()
- ENDIF()
-ENDMACRO()
-
-#---------------------------------------------------
# Macro: TARGET_LOCATIONS_GET_LIST _VAR
#
#---------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
