Revision: 57050
http://sourceforge.net/p/brlcad/code/57050
Author: starseeker
Date: 2013-08-22 02:29:15 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
We don't appear to need the RESOLVE_LIBRARIES macro
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_CheckFunctions.cmake
brlcad/trunk/misc/CMake/FindTERMLIB.cmake
brlcad/trunk/misc/pkgconfig/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/misc/CMake/ResolveCompilerPaths.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_CheckFunctions.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_CheckFunctions.cmake 2013-08-22 02:05:50 UTC
(rev 57049)
+++ brlcad/trunk/misc/CMake/BRLCAD_CheckFunctions.cmake 2013-08-22 02:29:15 UTC
(rev 57050)
@@ -43,7 +43,6 @@
include(CheckTypeSize)
include(CheckLibraryExists)
include(CheckStructHasMember)
-include(ResolveCompilerPaths)
###
@@ -173,9 +172,7 @@
if(NOT ${targetname}_LIBRARY)
CHECK_LIBRARY_EXISTS(${lname} ${func} "" HAVE_${targetname}_${lname})
if(HAVE_${targetname}_${lname})
- RESOLVE_LIBRARIES (${targetname}_LIBRARY "-l${lname}")
- set(${targetname}_LINKOPT "-l${lname}" CACHE STRING "${targetname} link
option")
- mark_as_advanced(${targetname}_LINKOPT)
+ set(${targetname}_LIBRARY "${lname}")
endif(HAVE_${targetname}_${lname})
endif(NOT ${targetname}_LIBRARY)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_TMP}")
Modified: brlcad/trunk/misc/CMake/FindTERMLIB.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindTERMLIB.cmake 2013-08-22 02:05:50 UTC (rev
57049)
+++ brlcad/trunk/misc/CMake/FindTERMLIB.cmake 2013-08-22 02:29:15 UTC (rev
57050)
@@ -41,15 +41,11 @@
# TERMLIB_FOUND - library found.
#
#=============================================================================
-include(ResolveCompilerPaths)
macro(TERMLIB_CHECK_LIBRARY targetname lname func)
if(NOT ${targetname}_LIBRARY)
CHECK_LIBRARY_EXISTS(${lname} ${func} "" HAVE_${targetname}_${lname})
if(HAVE_${targetname}_${lname})
- find_path(TERMLIB_INCLUDE_DIR ${lname}.h)
- RESOLVE_LIBRARIES (${targetname}_LIBRARY "-l${lname}")
- set(${targetname}_LINKOPT "-l${lname}" CACHE STRING "${targetname} link
option")
- mark_as_advanced(${targetname}_LINKOPT)
+ set(${targetname}_LIBRARY "${lname}")
endif(HAVE_${targetname}_${lname})
endif(NOT ${targetname}_LIBRARY)
endmacro(TERMLIB_CHECK_LIBRARY lname func)
Deleted: brlcad/trunk/misc/CMake/ResolveCompilerPaths.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ResolveCompilerPaths.cmake 2013-08-22 02:05:50 UTC
(rev 57049)
+++ brlcad/trunk/misc/CMake/ResolveCompilerPaths.cmake 2013-08-22 02:29:15 UTC
(rev 57050)
@@ -1,136 +0,0 @@
-#=============================================================================
-# Copyright 2008 Jed Brown
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-# Jed Brown, nor the names of their contributors may be used to endorse
-# or promote products derived from this software without specific prior
-# written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# (Added license text after confirming with Jed Brown via email license
-# on his modules was the same as that of CMake - CY)
-#
-#=============================================================================
-# ResolveCompilerPaths - this module defines two macros
-#
-# RESOLVE_LIBRARIES (XXX_LIBRARIES LINK_LINE)
-# This macro is intended to be used by FindXXX.cmake modules.
-# It parses a compiler link line and resolves all libraries
-# (-lfoo) using the library path contexts (-L/path) in scope.
-# The result in XXX_LIBRARIES is the list of fully resolved libs.
-# Example:
-#
-# RESOLVE_LIBRARIES (FOO_LIBRARIES "-L/A -la -L/B -lb -lc -ld")
-#
-# will be resolved to
-#
-# FOO_LIBRARIES:STRING="/A/liba.so;/B/libb.so;/A/libc.so;/usr/lib/libd.so"
-#
-# if the filesystem looks like
-#
-# /A: liba.so libc.so
-# /B: liba.so libb.so
-# /usr/lib: liba.so libb.so libc.so libd.so
-#
-# and /usr/lib is a system directory.
-#
-# Note: If RESOLVE_LIBRARIES() resolves a link line differently from
-# the native linker, there is a bug in this macro (please report it).
-#
-# RESOLVE_INCLUDES (XXX_INCLUDES INCLUDE_LINE)
-# This macro is intended to be used by FindXXX.cmake modules.
-# It parses a compile line and resolves all includes
-# (-I/path/to/include) to a list of directories. Other flags are ignored.
-# Example:
-#
-# RESOLVE_INCLUDES (FOO_INCLUDES "-I/A -DBAR='\"irrelevant -I/string
here\"' -I/B")
-#
-# will be resolved to
-#
-# FOO_INCLUDES:STRING="/A;/B"
-#
-# assuming both directories exist.
-# Note: as currently implemented, the -I/string will be picked up mistakenly
(cry, cry)
-
-macro (RESOLVE_LIBRARIES LIBS LINK_LINE)
- string (REGEX MATCHALL "((-L|-l|-Wl)([^\" ]+|\"[^\"]+\")|/[^\"
]+(a|so|dll))" _all_tokens "${LINK_LINE}")
- set (_libs_found)
- set (_directory_list)
- foreach (token ${_all_tokens})
- if (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
- # If it's a library path, add it to the list
- string (REGEX REPLACE "^-L" "" token ${token})
- string (REGEX REPLACE "//" "/" token ${token})
- list (APPEND _directory_list ${token})
- elseif (token MATCHES "^(-l([^\" ]+|\"[^\"]+\")|/[^\" ]+(a|so|dll))")
- # It's a library, resolve the path by looking in the list and then (by
default) in system directories
- string (REGEX REPLACE "^-l" "" token ${token})
- set (_root)
- if (token MATCHES "^/") # We have an absolute path, add root to the
search path
- set (_root "/")
- endif (token MATCHES "^/")
- set (_lib "NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
- find_library (_lib ${token} HINTS ${_directory_list} ${_root})
- if (_lib)
- string (REPLACE "//" "/" _lib ${_lib})
- list (APPEND _libs_found ${_lib})
- else (_lib)
- message (STATUS "Unable to find library ${token}")
- endif (_lib)
- endif (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
- endforeach (token)
- set (_lib "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE)
- # only the LAST occurrence of each library is required since there should be
no circular dependencies
- if (_libs_found)
- list (REVERSE _libs_found)
- list (REMOVE_DUPLICATES _libs_found)
- list (REVERSE _libs_found)
- endif (_libs_found)
- set (${LIBS} "${_libs_found}")
-endmacro (RESOLVE_LIBRARIES)
-
-macro (RESOLVE_INCLUDES INCS COMPILE_LINE)
- string (REGEX MATCHALL "-I([^\" ]+|\"[^\"]+\")" _all_tokens
"${COMPILE_LINE}")
- set (_incs_found)
- foreach (token ${_all_tokens})
- string (REGEX REPLACE "^-I" "" token ${token})
- string (REGEX REPLACE "//" "/" token ${token})
- if (EXISTS ${token})
- list (APPEND _incs_found ${token})
- else (EXISTS ${token})
- message (STATUS "Include directory ${token} does not exist")
- endif (EXISTS ${token})
- endforeach (token)
- list (REMOVE_DUPLICATES _incs_found)
- set (${INCS} "${_incs_found}")
-endmacro (RESOLVE_INCLUDES)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/trunk/misc/pkgconfig/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/pkgconfig/CMakeLists.txt 2013-08-22 02:05:50 UTC (rev
57049)
+++ brlcad/trunk/misc/pkgconfig/CMakeLists.txt 2013-08-22 02:29:15 UTC (rev
57050)
@@ -8,7 +8,9 @@
set(datarootdir "\${prefix}/share")
set(datadir "\${datarootdir}")
set(LIBTCL "-ltcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
-set(LIBM "${M_LINKOPT}")
+if(M_LIBRARY)
+ set(LIBM "-l${M_LIBRARY}")
+endif(M_LIBRARY)
#The CMake system relies on the C++ compiler to find
#this, so we set it manually for pkgconfig
set(LIBSTDCXX "-lstdc++")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
