[Plplot-cvs] SF.net SVN: plplot:[12074] trunk

[<and...@us...>]

Revision: 12074
          http://plplot.svn.sourceforge.net/plplot/?rev=12074&view=rev
Author:   andrewross
Date:     2011-11-30 11:40:11 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Fix up pkg-config link options for NON_TRANSITIVE=ON case so examples work in the install tree with the Makefile build system.

Modified Paths:
--------------
    trunk/bindings/ada/CMakeLists.txt
    trunk/bindings/d/CMakeLists.txt
    trunk/bindings/tcl/CMakeLists.txt
    trunk/bindings/wxwidgets/CMakeLists.txt
    trunk/examples/c++/Makefile.examples.in

Modified: trunk/bindings/ada/CMakeLists.txt
===================================================================
--- trunk/bindings/ada/CMakeLists.txt	2011-11-30 11:11:23 UTC (rev 12073)
+++ trunk/bindings/ada/CMakeLists.txt	2011-11-30 11:40:11 UTC (rev 12074)
@@ -151,6 +151,9 @@
     string(REGEX REPLACE "^.*:.*:.*:(.*)$" "\\1" PC_LIBRARY_NAME ${PC_DATA})
     set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS}")
     set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}")
+    if(NON_TRANSITIVE)
+      set(PC_LINK_FLAGS "-lplplot${LIB_TAG} ${PC_LINK_FLAGS}")
+    endif(NON_TRANSITIVE)
     set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}")
     set(PC_CONFIGURED_FILE
       ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc

Modified: trunk/bindings/d/CMakeLists.txt
===================================================================
--- trunk/bindings/d/CMakeLists.txt	2011-11-30 11:11:23 UTC (rev 12073)
+++ trunk/bindings/d/CMakeLists.txt	2011-11-30 11:40:11 UTC (rev 12074)
@@ -110,6 +110,9 @@
     string(REGEX REPLACE "^.*:.*:(.*):.*$" "\\1" PC_LONG_NAME ${PC_DATA})
     string(REGEX REPLACE "^.*:.*:.*:(.*)$" "\\1" PC_LIBRARY_NAME ${PC_DATA})
     set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS}")
+    if(NON_TRANSITIVE)
+      set(PC_LINK_FLAGS "-lplplot${LIB_TAG} ${PC_LINK_FLAGS}")
+    endif(NON_TRANSITIVE)
     set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}")
     set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}")
     set(PC_CONFIGURED_FILE

Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt	2011-11-30 11:11:23 UTC (rev 12073)
+++ trunk/bindings/tcl/CMakeLists.txt	2011-11-30 11:40:11 UTC (rev 12074)
@@ -392,6 +392,9 @@
   string(REGEX REPLACE "^.*:.*:.*:(.*)$" "\\1" PC_LIBRARY_NAME ${PC_DATA})
   set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS}")
   set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}")
+  if(NON_TRANSITIVE)
+    set(PC_LINK_FLAGS "-lplplot${LIB_TAG} ${PC_LINK_FLAGS}")
+  endif(NON_TRANSITIVE)
   set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}")
   set(PC_CONFIGURED_FILE
   ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc

Modified: trunk/bindings/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/bindings/wxwidgets/CMakeLists.txt	2011-11-30 11:11:23 UTC (rev 12073)
+++ trunk/bindings/wxwidgets/CMakeLists.txt	2011-11-30 11:40:11 UTC (rev 12074)
@@ -169,6 +169,9 @@
     string(REGEX REPLACE "^.*:.*:.*:(.*)$" "\\1" PC_LIBRARY_NAME ${PC_DATA})
     set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS}")
     set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}")
+    if(NON_TRANSITIVE)
+      set(PC_LINK_FLAGS "-lplplotcxx${LIB_TAG} ${PC_LINK_FLAGS}")
+    endif(NON_TRANSITIVE)
     set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}")
     set(PC_CONFIGURED_FILE
       ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc

Modified: trunk/examples/c++/Makefile.examples.in
===================================================================
--- trunk/examples/c++/Makefile.examples.in	2011-11-30 11:11:23 UTC (rev 12073)
+++ trunk/examples/c++/Makefile.examples.in	2011-11-30 11:40:11 UTC (rev 12074)
@@ -88,7 +88,7 @@
 @qt_gui_true@@pkg_config_true@	$(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags-only-I plplot$(LIB_TAG)-qt` $< -o $@
 
 @qt_gui_true@@pkg_config_true@qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp
-@qt_gui_true@@pkg_config_true@	$(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-qt`
+@qt_gui_true@@pkg_config_true@	$(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-qt` `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot${LIB_TAG}`
 
 .cc$(EXEEXT):
 @pkg_config_true@	$(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-c++`

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.