Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12122] trunk
|
From: <and...@us...> - 2012-01-05 13:00:21
|
Revision: 12122
http://plplot.svn.sourceforge.net/plplot/?rev=12122&view=rev
Author: andrewross
Date: 2012-01-05 13:00:11 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Commit patch from Orion to fix a few more unnecessary linkage errors.
Modified Paths:
--------------
trunk/cmake/modules/FindLTDL.cmake
trunk/cmake/modules/tcl-related.cmake
trunk/cmake/modules/wxwidgets.cmake
trunk/examples/tk/Makefile.examples.in
Modified: trunk/cmake/modules/FindLTDL.cmake
===================================================================
--- trunk/cmake/modules/FindLTDL.cmake 2012-01-05 11:58:24 UTC (rev 12121)
+++ trunk/cmake/modules/FindLTDL.cmake 2012-01-05 13:00:11 UTC (rev 12122)
@@ -40,40 +40,44 @@
endif(${_lib})
endmacro(_find_check_libs)
- # Find and check platform-dependent libraries which
- # libltdl depends upon using model given
- # for determining LIBADD_DL in $prefix/share/libtool/libltdl/acinclude.m4
+ if(NOT NON_TRANSITIVE)
+ # Find and check platform-dependent libraries which
+ # libltdl depends upon using model given
+ # for determining LIBADD_DL in $prefix/share/libtool/libltdl/acinclude.m4
- # Look for three exclusive alternatives:
- # (dld shl_load; dl dlopen; svdl dlopen)
- # N.B. all the different ADDLIB variables have to be different because
- # of caching of results in the macro.
- _find_check_libs(dld shl_load LTDL_LTDL_ADDLIB0 LTDL_LTDL_HAVE_ADDLIB0)
- if(LTDL_LTDL_HAVE_ADDLIB0)
- set(LTDL_LIBRARIES ${LTDL_LIBRARIES} ${LTDL_LTDL_ADDLIB0})
- set(LTDL_FOUND ON)
- else(LTDL_LTDL_HAVE_ADDLIB0)
- _find_check_libs(dl dlopen LTDL_LTDL_ADDLIB1 LTDL_LTDL_HAVE_ADDLIB1)
- if(LTDL_LTDL_HAVE_ADDLIB1)
- set(LTDL_LIBRARIES ${LTDL_LIBRARIES} ${LTDL_LTDL_ADDLIB1})
+ # Look for three exclusive alternatives:
+ # (dld shl_load; dl dlopen; svdl dlopen)
+ # N.B. all the different ADDLIB variables have to be different because
+ # of caching of results in the macro.
+ _find_check_libs(dld shl_load LTDL_LTDL_ADDLIB0 LTDL_LTDL_HAVE_ADDLIB0)
+ if(LTDL_LTDL_HAVE_ADDLIB0)
+ set(LTDL_LIBRARIES ${LTDL_LIBRARIES} ${LTDL_LTDL_ADDLIB0})
set(LTDL_FOUND ON)
- else(LTDL_LTDL_HAVE_ADDLIB1)
- _find_check_libs(svdl dlopen LTDL_LTDL_ADDLIB2 LTDL_LTDL_HAVE_ADDLIB2)
- if(LTDL_LTDL_HAVE_ADDLIB2)
- set(LTDL_LIBRARIES ${LTDL_LIBRARIES} ${LTDL_LTDL_ADDLIB2})
+ else(LTDL_LTDL_HAVE_ADDLIB0)
+ _find_check_libs(dl dlopen LTDL_LTDL_ADDLIB1 LTDL_LTDL_HAVE_ADDLIB1)
+ if(LTDL_LTDL_HAVE_ADDLIB1)
+ set(LTDL_LIBRARIES ${LTDL_LIBRARIES} ${LTDL_LTDL_ADDLIB1})
set(LTDL_FOUND ON)
- else(LTDL_LTDL_HAVE_ADDLIB2)
- set(LTDL_FOUND OFF)
- endif(LTDL_LTDL_HAVE_ADDLIB2)
- endif(LTDL_LTDL_HAVE_ADDLIB1)
- endif(LTDL_LTDL_HAVE_ADDLIB0)
+ else(LTDL_LTDL_HAVE_ADDLIB1)
+ _find_check_libs(svdl dlopen LTDL_LTDL_ADDLIB2 LTDL_LTDL_HAVE_ADDLIB2)
+ if(LTDL_LTDL_HAVE_ADDLIB2)
+ set(LTDL_LIBRARIES ${LTDL_LIBRARIES} ${LTDL_LTDL_ADDLIB2})
+ set(LTDL_FOUND ON)
+ else(LTDL_LTDL_HAVE_ADDLIB2)
+ set(LTDL_FOUND OFF)
+ endif(LTDL_LTDL_HAVE_ADDLIB2)
+ endif(LTDL_LTDL_HAVE_ADDLIB1)
+ endif(LTDL_LTDL_HAVE_ADDLIB0)
- # (dld dld_link) appended to any that have been found before.
- _find_check_libs(dld dld_link LTDL_LTDL_ADDLIB3 LTDL_LTDL_HAVE_ADDLIB3)
- if(LTDL_LTDL_HAVE_ADDLIB3)
- set(LTDL_LIBRARIES ${LTDL_LIBRARIES} ${LTDL_LTDL_ADDLIB3})
+ # (dld dld_link) appended to any that have been found before.
+ _find_check_libs(dld dld_link LTDL_LTDL_ADDLIB3 LTDL_LTDL_HAVE_ADDLIB3)
+ if(LTDL_LTDL_HAVE_ADDLIB3)
+ set(LTDL_LIBRARIES ${LTDL_LIBRARIES} ${LTDL_LTDL_ADDLIB3})
+ set(LTDL_FOUND ON)
+ endif(LTDL_LTDL_HAVE_ADDLIB3)
+ else(NOT NON_TRANSITIVE)
set(LTDL_FOUND ON)
- endif(LTDL_LTDL_HAVE_ADDLIB3)
+ endif(NOT NON_TRANSITIVE)
endif(LTDL_LIBRARIES)
endif(LTDL_INCLUDE_DIR)
Modified: trunk/cmake/modules/tcl-related.cmake
===================================================================
--- trunk/cmake/modules/tcl-related.cmake 2012-01-05 11:58:24 UTC (rev 12121)
+++ trunk/cmake/modules/tcl-related.cmake 2012-01-05 13:00:11 UTC (rev 12122)
@@ -138,7 +138,7 @@
endif(ENABLE_tk AND NOT X11_FOUND)
if(ENABLE_tk)
set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR})
- set(TK_LIBRARY ${TK_LIBRARY} ${X11_LIBRARIES})
+ set(TK_LIBRARY ${TK_LIBRARY})
message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}")
message(STATUS "TK_LIBRARY = ${TK_LIBRARY}")
else(ENABLE_tk)
Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake 2012-01-05 11:58:24 UTC (rev 12121)
+++ trunk/cmake/modules/wxwidgets.cmake 2012-01-05 13:00:11 UTC (rev 12122)
@@ -91,11 +91,6 @@
wxwidgets_COMPILE_FLAGS
"${wxwidgets_COMPILE_FLAGS} -I${AGG_INCLUDE_DIRS}"
)
- set(
- wxwidgets_LINK_FLAGS
- ${wxwidgets_LINK_FLAGS}
- ${AGG_LIBRARIES}
- )
else(HAVE_AGG)
message(STATUS "WARNING: wxwidgets driver and bindings components depending on AGG library have been dropped.")
endif(HAVE_AGG)
@@ -103,11 +98,6 @@
wxwidgets_COMPILE_FLAGS
"${wxwidgets_COMPILE_FLAGS} -I${FREETYPE_INCLUDE_DIR}"
)
- set(
- wxwidgets_LINK_FLAGS
- ${wxwidgets_LINK_FLAGS}
- ${FREETYPE_LIBRARIES}
- )
endif(WITH_FREETYPE)
set(DRIVERS_LINK_FLAGS
${DRIVERS_LINK_FLAGS}
Modified: trunk/examples/tk/Makefile.examples.in
===================================================================
--- trunk/examples/tk/Makefile.examples.in 2012-01-05 11:58:24 UTC (rev 12121)
+++ trunk/examples/tk/Makefile.examples.in 2012-01-05 13:00:11 UTC (rev 12122)
@@ -37,7 +37,7 @@
rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list)
.c$(EXEEXT):
-@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-tcl`
-@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl`
+@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-tcl` -lm
+@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl` -lm
.SUFFIXES: .c $(EXEEXT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
