From: DRC <dcommander@users.sourceforge.net>
Date: Wed, 22 Jun 2011 00:11:00 +0000 (+0000)
Subject: Fix several bugs in the generation of .la files
X-Git-Tag: v1.1.90~274
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=801ef7ca6c3f3a33cc7e9bafde0d50a265b533c1;p=tigervnc.git

Fix several bugs in the generation of .la files


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4512 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/cmake/Modules/CMakeMacroLibtoolFile.cmake b/cmake/Modules/CMakeMacroLibtoolFile.cmake
index 4a7c0c0b..df9d49f8 100644
--- a/cmake/Modules/CMakeMacroLibtoolFile.cmake
+++ b/cmake/Modules/CMakeMacroLibtoolFile.cmake
@@ -31,7 +31,7 @@ macro(libtool_create_control_file _target)
         # No shared library extension matched.  Check whether target is a CMake
         # target.
         get_target_property(_ltp ${library} TYPE)
-        if(${_ltp})
+        if(NOT _ltp AND NOT ${library} STREQUAL "general")
           # Not a CMake target, so use find_library() to attempt to locate the
           # library in a system directory.
           find_library(FL ${library})
@@ -41,7 +41,7 @@ macro(libtool_create_control_file _target)
             get_filename_component(_shared_lib ${FL} NAME_WE)
             get_filename_component(_shared_lib_path ${FL} PATH)
             string(REPLACE "lib" "" _shared_lib ${_shared_lib})
-            set(_target_dependency_libs "${_target_dependency_libs} -L${_share_lib_path} -l${_shared_lib}")
+            set(_target_dependency_libs "${_target_dependency_libs} -L${_shared_lib_path} -l${_shared_lib}")
           else()
             # No shared library found, so ignore target.
           endif()
@@ -55,7 +55,7 @@ macro(libtool_create_control_file _target)
       # absolute and, if not, use find_library() to get the abolute path.
       get_filename_component(_name ${library} NAME)
       string(REPLACE "${_name}" "" _path ${library})
-      if(NOT "${_path}" MATCHES "")
+      if(NOT "${_path}" STREQUAL "")
       	# Pathname is absolute, so add it to the libtool library dependencies
         # as-is.
         set(_target_dependency_libs "${_target_dependency_libs} ${library}")