From: <ai...@us...> - 2009-04-18 00:52:32
|
Revision: 9815 http://plplot.svn.sourceforge.net/plplot/?rev=9815&view=rev Author: airwin Date: 2009-04-18 00:52:12 +0000 (Sat, 18 Apr 2009) Log Message: ----------- Add -DPLD_extqt to the compile flags that are delivered by pkg-config. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2009-04-17 22:31:29 UTC (rev 9814) +++ trunk/bindings/qt_gui/CMakeLists.txt 2009-04-18 00:52:12 UTC (rev 9815) @@ -66,7 +66,7 @@ set(qt_LOCATION) endif(ENABLE_DYNDRIVERS) set(PC_LINK_FLAGS "${qt_LOCATION} ${lib${PC_LIBRARY_NAME}_LINK_FLAGS}") - set(PC_COMPILE_FLAGS "${qt_COMPILE_FLAGS}") + set(PC_COMPILE_FLAGS "-DPLD_extqt ${qt_COMPILE_FLAGS}") set(PC_CONFIGURED_FILE ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-16 19:28:01
|
Revision: 10051 http://plplot.svn.sourceforge.net/plplot/?rev=10051&view=rev Author: airwin Date: 2009-06-16 19:27:55 +0000 (Tue, 16 Jun 2009) Log Message: ----------- Correct install location and rpath of libplplotqt. The resulting installed library passes the ldd -r test. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2009-06-16 17:19:36 UTC (rev 10050) +++ trunk/bindings/qt_gui/CMakeLists.txt 2009-06-16 19:27:55 UTC (rev 10051) @@ -93,14 +93,14 @@ ${MATH_LIB} ${qt_LINK_FLAGS} ) - # qt_RPATH originally set in cmake/modules files for - # each driver in ${DRIVERS_LIST}. This is only used for the + # qt_RPATH set in cmake/modules/qt.cmake. This is only used for the # install-tree rpath since cmake handles the build-tree rpath # automatically (so long as full pathnames to libraries are used). - #message("qt_RPATH = ${qt_RPATH}") + # message("qt_RPATH = ${qt_RPATH}") if(USE_RPATH) get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) - list(APPEND LIB_INSTALL_RPATH ${qt_RPATH}) + # Must prepend qt_RPATH because /usr/lib is sometimes in LIB_INSTALL_RPATH. + set(LIB_INSTALL_RPATH ${qt_RPATH} ${LIB_INSTALL_RPATH}) set_target_properties(plplotqt${LIB_TAG} PROPERTIES SOVERSION ${plplotqt_SOVERSION} @@ -118,7 +118,9 @@ endif(USE_RPATH) install(TARGETS plplotqt${LIB_TAG} EXPORT export_plplot - DESTINATION ${DRV_DIR} + ARCHIVE DESTINATION ${LIB_DIR} + LIBRARY DESTINATION ${LIB_DIR} + RUNTIME DESTINATION ${BIN_DIR} ) install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-27 16:30:26
|
Revision: 10078 http://plplot.svn.sourceforge.net/plplot/?rev=10078&view=rev Author: airwin Date: 2009-06-27 16:30:23 +0000 (Sat, 27 Jun 2009) Log Message: ----------- Fix bug introduced in revision 10050 where the library name was incorrectly excluded from PC_LINK_FLAGS. This fix allows qt_example to build again using the traditional Makefile+pkg-config build system for the installed examples. Revision Links: -------------- http://plplot.svn.sourceforge.net/plplot/?rev=10050&view=rev Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2009-06-27 04:24:43 UTC (rev 10077) +++ trunk/bindings/qt_gui/CMakeLists.txt 2009-06-27 16:30:23 UTC (rev 10078) @@ -167,6 +167,7 @@ string(REGEX REPLACE "^.*:.*:.*:(.*)$" "\\1" PC_LIBRARY_NAME ${PC_DATA}) set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS}") set(PC_COMPILE_FLAGS "-DPLD_extqt ${qt_COMPILE_FLAGS}") + 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 ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-20 21:59:06
|
Revision: 10171 http://plplot.svn.sourceforge.net/plplot/?rev=10171&view=rev Author: airwin Date: 2009-07-20 21:59:01 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Handle the install rpath for libplplotqt(d).so the same way it is done for qt.so. The order is (1) installed PLplot location, (2) Qt location, (3) Special rpath location for libplplot(d) which currently is the location for libltdl (normally but not always the system location [/usr/lib on Linux]). If (1) is the system location,then qt and libltdl will also be taken from the system location if they exist there. However, this should usually not be a problem since this case normally only occurs when all locations are system locations. If (2) is the system location, then libltdl will also be taken from the system location if that exists. This is probably not a major issue. The correct way to solve this is to exclude system locations from rpath locations, and presumably that can be done using the NO_CMAKE_SYSTEM_PATH signature for find_library, but I haven't tried that since for now the present RPATH order should be good enough for most purposes. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2009-07-20 21:32:08 UTC (rev 10170) +++ trunk/bindings/qt_gui/CMakeLists.txt 2009-07-20 21:59:01 UTC (rev 10171) @@ -97,11 +97,15 @@ # qt_RPATH set in cmake/modules/qt.cmake. This is only used for the # install-tree rpath since cmake handles the build-tree rpath # automatically (so long as full pathnames to libraries are used). - # message("qt_RPATH = ${qt_RPATH}") + #message("qt_RPATH = ${qt_RPATH}") if(USE_RPATH) - get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) - # Must prepend qt_RPATH because /usr/lib is sometimes in LIB_INSTALL_RPATH. - set(LIB_INSTALL_RPATH ${qt_RPATH} ${LIB_INSTALL_RPATH}) + # Order is important here because of /usr/lib concerns. + set(LIB_INSTALL_RPATH + ${LIB_DIR} + ${qt_RPATH} + ${libplplot${LIB_TAG}_RPATH} + ) + #message("LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}") set_target_properties(plplotqt${LIB_TAG} PROPERTIES SOVERSION ${plplotqt_SOVERSION} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-07-21 17:25:29
|
Revision: 10173 http://plplot.svn.sourceforge.net/plplot/?rev=10173&view=rev Author: airwin Date: 2009-07-21 17:25:25 +0000 (Tue, 21 Jul 2009) Log Message: ----------- Enforce correct dependencies for moc-generated source code that is included via a header that is created at cmake time. Result builds fine for an empty build directory, and after that passes the touch test for qt.h. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2009-07-21 09:53:08 UTC (rev 10172) +++ trunk/bindings/qt_gui/CMakeLists.txt 2009-07-21 17:25:25 UTC (rev 10173) @@ -79,14 +79,13 @@ ${CMAKE_SOURCE_DIR}/include/qt.h OPTIONS ${MOC_OPTIONS} ) - # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}") - #set_source_files_properties( - # ${QT_MOC_OUTFILES} - # PROPERTIES GENERATED "ON" - # ) - #add_library(plplotqt${LIB_TAG} ${qt_SOURCE} ${QT_MOC_OUTFILES}) + # CMake does not handle dependendencies correctly for GENERATED source + # code that is #included by a header that is created at cmake time. + # Therefore, use fundamental means to force correct dependencies. + add_custom_target(moc_outfile_generated DEPENDS ${QT_MOC_OUTFILES}) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/moc_files.h "#include \"${QT_MOC_OUTFILES}\"\n") add_library(plplotqt${LIB_TAG} ${qt_SOURCE}) + add_dependencies(plplotqt${LIB_TAG} moc_outfile_generated) else(MOC_OPTIONS) add_library(plplotqt${LIB_TAG} ${qt_SOURCE}) endif(MOC_OPTIONS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-08-03 05:53:51
|
Revision: 10202 http://plplot.svn.sourceforge.net/plplot/?rev=10202&view=rev Author: airwin Date: 2009-08-03 05:53:43 +0000 (Mon, 03 Aug 2009) Log Message: ----------- Fix spelling error in comment. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2009-08-03 02:27:19 UTC (rev 10201) +++ trunk/bindings/qt_gui/CMakeLists.txt 2009-08-03 05:53:43 UTC (rev 10202) @@ -79,7 +79,7 @@ ${CMAKE_SOURCE_DIR}/include/qt.h OPTIONS ${MOC_OPTIONS} ) - # CMake does not handle dependendencies correctly for GENERATED source + # CMake does not handle dependencies correctly for GENERATED source # code that is #included by a header that is created at cmake time. # Therefore, use fundamental means to force correct dependencies. add_custom_target(moc_outfile_generated DEPENDS ${QT_MOC_OUTFILES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-08-20 18:25:32
|
Revision: 11142 http://plplot.svn.sourceforge.net/plplot/?rev=11142&view=rev Author: airwin Date: 2010-08-20 18:25:26 +0000 (Fri, 20 Aug 2010) Log Message: ----------- Drop -DPLD_extqt flag from pkg-config results for plplotd-qt.pc. This flag was redundant and generated lots of compile warning messages because of that. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2010-08-20 18:21:25 UTC (rev 11141) +++ trunk/bindings/qt_gui/CMakeLists.txt 2010-08-20 18:25:26 UTC (rev 11142) @@ -128,7 +128,7 @@ 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}") - set(PC_COMPILE_FLAGS "-DPLD_extqt ${qt_COMPILE_FLAGS}") + set(PC_COMPILE_FLAGS "${qt_COMPILE_FLAGS}") 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-08-16 11:10:15
|
Revision: 12216 http://plplot.svn.sourceforge.net/plplot/?rev=12216&view=rev Author: andrewross Date: 2012-08-16 11:10:09 +0000 (Thu, 16 Aug 2012) Log Message: ----------- Programs linking in libplplotqtd also need to explicitly link in QtCore. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2012-08-15 10:17:55 UTC (rev 12215) +++ trunk/bindings/qt_gui/CMakeLists.txt 2012-08-16 11:10:09 UTC (rev 12216) @@ -60,7 +60,7 @@ if(NON_TRANSITIVE) # empty list ==> non-transitive linking for everything that links to # libplplotqtd in the shared libraries case. - target_link_libraries(plplotqt${LIB_TAG} LINK_INTERFACE_LIBRARIES) + target_link_libraries(plplotqt${LIB_TAG} LINK_INTERFACE_LIBRARIES QtCore) # This configures the pkg-config method to use non-transitive linking. set(PC_REQUIRES_TAG "Requires.private") else(NON_TRANSITIVE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-08-18 20:48:19
|
Revision: 12217 http://plplot.svn.sourceforge.net/plplot/?rev=12217&view=rev Author: andrewross Date: 2012-08-18 20:48:12 +0000 (Sat, 18 Aug 2012) Log Message: ----------- Second attempt at fixing Qt driver linking issue on Mac OS-X. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2012-08-16 11:10:09 UTC (rev 12216) +++ trunk/bindings/qt_gui/CMakeLists.txt 2012-08-18 20:48:12 UTC (rev 12217) @@ -58,9 +58,17 @@ ${QT_LIBRARIES} ) if(NON_TRANSITIVE) + message("QT_LIBRARIES = ${QT_LIBRARIES}") + set(QT_LINK_LIBS "") + foreach(l ${QT_LIBRARIES}) + if(${l} MATCHES "QtCore") + set(QT_LINK_LIBS ${QT_LINK_LIBS} ${l}) + endif(${l} MATCHES "QtCore") + endforeach(l ${QT_LIBRARIES}) + message("QT_LINK_LIBS = ${QT_LINK_LIBS}") # empty list ==> non-transitive linking for everything that links to # libplplotqtd in the shared libraries case. - target_link_libraries(plplotqt${LIB_TAG} LINK_INTERFACE_LIBRARIES QtCore) + target_link_libraries(plplotqt${LIB_TAG} LINK_INTERFACE_LIBRARIES ${QT_LINK_LIBS}) # This configures the pkg-config method to use non-transitive linking. set(PC_REQUIRES_TAG "Requires.private") else(NON_TRANSITIVE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-08-20 21:06:47
|
Revision: 12218 http://plplot.svn.sourceforge.net/plplot/?rev=12218&view=rev Author: andrewross Date: 2012-08-20 21:06:40 +0000 (Mon, 20 Aug 2012) Log Message: ----------- Another, more conservative, attempt to fix the issues with qt linkage on Mac OS-X. Modified Paths: -------------- trunk/bindings/qt_gui/CMakeLists.txt Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2012-08-18 20:48:12 UTC (rev 12217) +++ trunk/bindings/qt_gui/CMakeLists.txt 2012-08-20 21:06:40 UTC (rev 12218) @@ -58,17 +58,13 @@ ${QT_LIBRARIES} ) if(NON_TRANSITIVE) - message("QT_LIBRARIES = ${QT_LIBRARIES}") - set(QT_LINK_LIBS "") - foreach(l ${QT_LIBRARIES}) - if(${l} MATCHES "QtCore") - set(QT_LINK_LIBS ${QT_LINK_LIBS} ${l}) - endif(${l} MATCHES "QtCore") - endforeach(l ${QT_LIBRARIES}) - message("QT_LINK_LIBS = ${QT_LINK_LIBS}") + # Note that there are implicit references to classes in QtCore, QtGui and QtSvg + # so we need to add all three to the list of libraries to link to plplotqtd. + # This is just equivalent to adding QT_LIBRARIES. + # # empty list ==> non-transitive linking for everything that links to # libplplotqtd in the shared libraries case. - target_link_libraries(plplotqt${LIB_TAG} LINK_INTERFACE_LIBRARIES ${QT_LINK_LIBS}) + target_link_libraries(plplotqt${LIB_TAG} LINK_INTERFACE_LIBRARIES ${QT_LIBRARIES}) # This configures the pkg-config method to use non-transitive linking. set(PC_REQUIRES_TAG "Requires.private") else(NON_TRANSITIVE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |