From: <ai...@us...> - 2008-10-14 01:22:08
|
Revision: 8889 http://plplot.svn.sourceforge.net/plplot/?rev=8889&view=rev Author: airwin Date: 2008-10-14 01:22:06 +0000 (Tue, 14 Oct 2008) Log Message: ----------- Solved long-standing screwup in install rpath order that was causing system versions of libplplot to be accessed by dynamic devices rather than the correct version corresponding to the actual install prefix. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2008-10-13 05:57:25 UTC (rev 8888) +++ trunk/drivers/CMakeLists.txt 2008-10-14 01:22:06 UTC (rev 8889) @@ -96,9 +96,9 @@ # automatically (so long as full pathnames to libraries are used). set( ${SOURCE_ROOT_NAME}_RPATH + ${LIB_DIR} ${${SOURCE_ROOT_NAME}_RPATH} ${libplplot${LIB_TAG}_RPATH} - ${LIB_DIR} ) # Our implementation of dynamic loading using libltdl assumes # the prefix should always be nothing (rather than lib) and the suffix This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2008-10-14 20:52:57
|
Revision: 8903 http://plplot.svn.sourceforge.net/plplot/?rev=8903&view=rev Author: smekal Date: 2008-10-14 20:52:52 +0000 (Tue, 14 Oct 2008) Log Message: ----------- On Win32 platforms the shared library suffix is always 'dll' (even for Cygwin and MSys). Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2008-10-14 20:48:43 UTC (rev 8902) +++ trunk/drivers/CMakeLists.txt 2008-10-14 20:52:52 UTC (rev 8903) @@ -104,14 +104,14 @@ # the prefix should always be nothing (rather than lib) and the suffix # should be set in a platform-dependent manner in order for libltdl # to find the dynamic device. - if(CYGWIN) + if(WIN32) # strace showed that .dll was a must for libltdl on Cygwin. set(DYNAMIC_SUFFIX ".dll") - else(CYGWIN) + else(WIN32) # So far this works on all non-Cygwin systems, but only Linux and # Mac OS X have been tested so far. set(DYNAMIC_SUFFIX ".so") - endif(CYGWIN) + endif(WIN32) #message("${SOURCE_ROOT_NAME}_RPATH = ${${SOURCE_ROOT_NAME}_RPATH}") if(USE_RPATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-03-09 19:33:38
|
Revision: 9687 http://plplot.svn.sourceforge.net/plplot/?rev=9687&view=rev Author: airwin Date: 2009-03-09 19:33:22 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Pass "-DPLD_qtwidget=ON" option to moc when the qt device is being built with -DPLD_qtwidget=ON. This sorts out all cmake-2.6.0 problems with using moc so that 2.6.3 is no longer a necessity for building the qt device driver. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2009-03-09 18:05:18 UTC (rev 9686) +++ trunk/drivers/CMakeLists.txt 2009-03-09 19:33:22 UTC (rev 9687) @@ -90,18 +90,21 @@ PROPERTIES COMPILE_FLAGS "-DUSINGDLL" ) endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS) - if(SOURCE_ROOT_NAME STREQUAL "qt") - qt4_wrap_cpp(QT_MOC_OUTFILES ${CMAKE_CURRENT_SOURCE_DIR}/qt.h) - # Temporary debugging message. - message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}") + if(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget) + qt4_wrap_cpp( + QT_MOC_OUTFILES + ${CMAKE_CURRENT_SOURCE_DIR}/qt.h + OPTIONS "-DPLD_qtwidget=ON" + ) + # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}") set_source_files_properties( ${QT_MOC_OUTFILES} PROPERTIES GENERATED "ON" ) add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE} ${QT_MOC_OUTFILES}) - else(SOURCE_ROOT_NAME STREQUAL "qt") + else(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget) add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE}) - endif(SOURCE_ROOT_NAME STREQUAL "qt") + endif(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget) # ${SOURCE_ROOT_NAME}_LINK_FLAGS is ideally a list of the full path names # to libraries determined with find_library. However, the list can also # include link flags such as the -L and -l form of specifying libraries, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-03-11 02:48:10
|
Revision: 9712 http://plplot.svn.sourceforge.net/plplot/?rev=9712&view=rev Author: airwin Date: 2009-03-11 02:48:05 +0000 (Wed, 11 Mar 2009) Log Message: ----------- Implement a TEST_DYNDRIVERS option (defaults to OFF) for building and running get-drv-info. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2009-03-11 02:42:36 UTC (rev 9711) +++ trunk/drivers/CMakeLists.txt 2009-03-11 02:48:05 UTC (rev 9712) @@ -20,75 +20,78 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA install( -FILES README.drivers README.wxwidgets -DESTINATION ${DOC_DIR} -) + FILES README.drivers README.wxwidgets + DESTINATION ${DOC_DIR} + ) #qt.h only useful if anyone wants to build a Qt application with the Qt widget driver if(PLD_qtwidget) -install( -FILES qt.h -DESTINATION ${INCLUDE_DIR} -) + install( + FILES qt.h + DESTINATION ${INCLUDE_DIR} + ) endif(PLD_qtwidget) if(ENABLE_DYNDRIVERS) - set_source_files_properties( - get-drv-info.c - PROPERTIES COMPILE_FLAGS "-I${LTDL_INCLUDE_DIR} -DUSINGDLL" - ) - include_directories( - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/lib/qsastime - ${CMAKE_SOURCE_DIR}/lib/nistcd - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/include - ) + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/lib/qsastime + ${CMAKE_SOURCE_DIR}/lib/nistcd + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include + ) - if(NOT CMAKE_CROSSCOMPILING) - add_executable(get-drv-info get-drv-info.c) - target_link_libraries(get-drv-info - plplot${LIB_TAG} - ${LTDL_LIBRARIES} - ) - set(get-drv-info_RPATH - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/src - ${CMAKE_BINARY_DIR}/lib/csa - ${CMAKE_BINARY_DIR}/lib/nn - ${CMAKE_BINARY_DIR}/lib/qsastime - ${libplplot${LIB_TAG}_RPATH} - ) - - set_target_properties( - get-drv-info - PROPERTIES - INSTALL_RPATH "${get-drv-info_RPATH}" - BUILD_WITH_INSTALL_RPATH ON - ) - else(NOT CMAKE_CROSSCOMPILING) - set(IMPORT_EXECUTABLES ${CMAKE_NATIVE_BINARY_DIR}/drivers/ImportExecutables.cmake) - include(${IMPORT_EXECUTABLES}) - endif(NOT CMAKE_CROSSCOMPILING) + option(TEST_DYNDRIVERS "Test dynamic drivers" OFF) + if(TEST_DYNDRIVERS) + set_source_files_properties( + get-drv-info.c + PROPERTIES COMPILE_FLAGS "-I${LTDL_INCLUDE_DIR} -DUSINGDLL" + ) + + if(NOT CMAKE_CROSSCOMPILING) + add_executable(get-drv-info get-drv-info.c) + target_link_libraries(get-drv-info + plplot${LIB_TAG} + ${LTDL_LIBRARIES} + ) + set(get-drv-info_RPATH + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/src + ${CMAKE_BINARY_DIR}/lib/csa + ${CMAKE_BINARY_DIR}/lib/nn + ${CMAKE_BINARY_DIR}/lib/qsastime + ${libplplot${LIB_TAG}_RPATH} + ) + + set_target_properties( + get-drv-info + PROPERTIES + INSTALL_RPATH "${get-drv-info_RPATH}" + BUILD_WITH_INSTALL_RPATH ON + ) + else(NOT CMAKE_CROSSCOMPILING) + set(IMPORT_EXECUTABLES ${CMAKE_NATIVE_BINARY_DIR}/drivers/ImportExecutables.cmake) + include(${IMPORT_EXECUTABLES}) + endif(NOT CMAKE_CROSSCOMPILING) - if(NOT CMAKE_CROSSCOMPILING) - export(TARGETS get-drv-info FILE ${CMAKE_CURRENT_BINARY_DIR}/ImportExecutables.cmake ) - endif(NOT CMAKE_CROSSCOMPILING) + if(NOT CMAKE_CROSSCOMPILING) + export(TARGETS get-drv-info FILE ${CMAKE_CURRENT_BINARY_DIR}/ImportExecutables.cmake ) + endif(NOT CMAKE_CROSSCOMPILING) + endif(TEST_DYNDRIVERS) foreach(SOURCE_ROOT_NAME ${DRIVERS_LIST}) #message("${SOURCE_ROOT_NAME}_SOURCE = ${${SOURCE_ROOT_NAME}_SOURCE}") if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS) set_source_files_properties( - ${${SOURCE_ROOT_NAME}_SOURCE} - PROPERTIES COMPILE_FLAGS "${${SOURCE_ROOT_NAME}_COMPILE_FLAGS} -DUSINGDLL" - ) + ${${SOURCE_ROOT_NAME}_SOURCE} + PROPERTIES COMPILE_FLAGS "${${SOURCE_ROOT_NAME}_COMPILE_FLAGS} -DUSINGDLL" + ) #message("${SOURCE_ROOT_NAME}_COMPILE_FLAGS = ${${SOURCE_ROOT_NAME}_COMPILE_FLAGS}") else(${SOURCE_ROOT_NAME}_COMPILE_FLAGS) set_source_files_properties( - ${${SOURCE_ROOT_NAME}_SOURCE} - PROPERTIES COMPILE_FLAGS "-DUSINGDLL" - ) + ${${SOURCE_ROOT_NAME}_SOURCE} + PROPERTIES COMPILE_FLAGS "-DUSINGDLL" + ) endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS) if(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget) qt4_wrap_cpp( @@ -98,12 +101,12 @@ ) # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}") set_source_files_properties( - ${QT_MOC_OUTFILES} - PROPERTIES GENERATED "ON" - ) + ${QT_MOC_OUTFILES} + PROPERTIES GENERATED "ON" + ) add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE} ${QT_MOC_OUTFILES}) else(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget) - add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE}) + add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE}) endif(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget) # ${SOURCE_ROOT_NAME}_LINK_FLAGS is ideally a list of the full path names # to libraries determined with find_library. However, the list can also @@ -116,22 +119,22 @@ # device driver depends on. #message("${SOURCE_ROOT_NAME}_TARGETS = ${${SOURCE_ROOT_NAME}_TARGETS}") target_link_libraries( - ${SOURCE_ROOT_NAME} - plplot${LIB_TAG} - ${MATH_LIB} - ${${SOURCE_ROOT_NAME}_LINK_FLAGS} - ${${SOURCE_ROOT_NAME}_TARGETS} - ) + ${SOURCE_ROOT_NAME} + plplot${LIB_TAG} + ${MATH_LIB} + ${${SOURCE_ROOT_NAME}_LINK_FLAGS} + ${${SOURCE_ROOT_NAME}_TARGETS} + ) # ${SOURCE_ROOT_NAME}_RPATH originally set in cmake/modules files for # each driver in ${DRIVERS_LIST}. 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). set( - ${SOURCE_ROOT_NAME}_RPATH - ${LIB_DIR} - ${${SOURCE_ROOT_NAME}_RPATH} - ${libplplot${LIB_TAG}_RPATH} - ) + ${SOURCE_ROOT_NAME}_RPATH + ${LIB_DIR} + ${${SOURCE_ROOT_NAME}_RPATH} + ${libplplot${LIB_TAG}_RPATH} + ) # Our implementation of dynamic loading using libltdl assumes # the prefix should always be nothing (rather than lib) and the suffix # should be set in a platform-dependent manner in order for libltdl @@ -148,47 +151,49 @@ #message("${SOURCE_ROOT_NAME}_RPATH = ${${SOURCE_ROOT_NAME}_RPATH}") if(USE_RPATH) set_target_properties( - ${SOURCE_ROOT_NAME} - PROPERTIES - PREFIX "" - SUFFIX ${DYNAMIC_SUFFIX} - INSTALL_RPATH - "${${SOURCE_ROOT_NAME}_RPATH}" - ) + ${SOURCE_ROOT_NAME} + PROPERTIES + PREFIX "" + SUFFIX ${DYNAMIC_SUFFIX} + INSTALL_RPATH + "${${SOURCE_ROOT_NAME}_RPATH}" + ) else(USE_RPATH) set_target_properties( - ${SOURCE_ROOT_NAME} - PROPERTIES - PREFIX "" - SUFFIX ${DYNAMIC_SUFFIX} - ) + ${SOURCE_ROOT_NAME} + PROPERTIES + PREFIX "" + SUFFIX ${DYNAMIC_SUFFIX} + ) endif(USE_RPATH) - get_target_property( - ${SOURCE_ROOT_NAME}_LOCATION - ${SOURCE_ROOT_NAME} - LOCATION - ) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc - COMMAND get-drv-info - ${SOURCE_ROOT_NAME} - > ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc - DEPENDS - ${${SOURCE_ROOT_NAME}_LOCATION} - ) - add_custom_target( - ${SOURCE_ROOT_NAME}_CHECK ALL - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc - ) - # Workaround CMake 2-level make recursion issue for parallel builds. - add_dependencies(${SOURCE_ROOT_NAME}_CHECK ${SOURCE_ROOT_NAME}) + if(TEST_DYNDRIVERS) + get_target_property( + ${SOURCE_ROOT_NAME}_LOCATION + ${SOURCE_ROOT_NAME} + LOCATION + ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc + COMMAND get-drv-info + ${SOURCE_ROOT_NAME} + > ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc + DEPENDS + ${${SOURCE_ROOT_NAME}_LOCATION} + ) + add_custom_target( + ${SOURCE_ROOT_NAME}_CHECK ALL + DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc + ) + # Workaround CMake 2-level make recursion issue for parallel builds. + add_dependencies(${SOURCE_ROOT_NAME}_CHECK ${SOURCE_ROOT_NAME}) + endif(TEST_DYNDRIVERS) install(TARGETS ${SOURCE_ROOT_NAME} DESTINATION ${DRV_DIR}) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc - DESTINATION ${DRV_DIR} - ) + FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc + DESTINATION ${DRV_DIR} + ) endforeach(SOURCE_ROOT_NAME ${DRIVERS_LIST}) endif(ENABLE_DYNDRIVERS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-04-16 23:07:16
|
Revision: 9809 http://plplot.svn.sourceforge.net/plplot/?rev=9809&view=rev Author: airwin Date: 2009-04-16 23:07:07 +0000 (Thu, 16 Apr 2009) Log Message: ----------- Install qt.h if either PLD_qtwidget or PLD_extqt are ON. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2009-04-16 22:36:09 UTC (rev 9808) +++ trunk/drivers/CMakeLists.txt 2009-04-16 23:07:07 UTC (rev 9809) @@ -25,12 +25,12 @@ ) #qt.h only useful if anyone wants to build a Qt application with the Qt widget driver -if(PLD_qtwidget) +if(PLD_qtwidget OR PLD_extqt) install( FILES qt.h DESTINATION ${INCLUDE_DIR} ) -endif(PLD_qtwidget) +endif(PLD_qtwidget OR PLD_extqt) if(ENABLE_DYNDRIVERS) include_directories( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-05-14 16:50:53
|
Revision: 10994 http://plplot.svn.sourceforge.net/plplot/?rev=10994&view=rev Author: airwin Date: 2010-05-14 16:50:47 +0000 (Fri, 14 May 2010) Log Message: ----------- Tweak variable name to improve naming consistency. Implement GLOBAL property that will make dyndriver test files conveniently accessible elsewhere. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2010-05-13 20:14:34 UTC (rev 10993) +++ trunk/drivers/CMakeLists.txt 2010-05-14 16:50:47 UTC (rev 10994) @@ -177,6 +177,7 @@ SUFFIX ${DYNAMIC_SUFFIX} ) endif(USE_RPATH) + if(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING) get_target_property( ${SOURCE_ROOT_NAME}_LOCATION @@ -196,15 +197,19 @@ ${${SOURCE_ROOT_NAME}_LOCATION} ${test-drv-info_LOCATION} ) - add_custom_target(test_${SOURCE_ROOT_NAME}_driver + add_custom_target(test_${SOURCE_ROOT_NAME}_dyndriver DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc ) - add_dependencies(test_${SOURCE_ROOT_NAME}_driver + set_property(GLOBAL + PROPERTY FILE_DEPENDS_${SOURCE_ROOT_NAME}_dyndriver + ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc + ) + add_dependencies(test_${SOURCE_ROOT_NAME}_dyndriver test-drv-info ${SOURCE_ROOT_NAME} ) - list(APPEND test_dyndrivers_TDEPENDS test_${SOURCE_ROOT_NAME}_driver) + list(APPEND test_dyndrivers_TDEPENDS test_${SOURCE_ROOT_NAME}_dyndriver) endif(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING) install(TARGETS ${SOURCE_ROOT_NAME} 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:32:19
|
Revision: 10170 http://plplot.svn.sourceforge.net/plplot/?rev=10170&view=rev Author: airwin Date: 2009-07-20 21:32:08 +0000 (Mon, 20 Jul 2009) Log Message: ----------- Tweak comment. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2009-07-20 21:12:55 UTC (rev 10169) +++ trunk/drivers/CMakeLists.txt 2009-07-20 21:32:08 UTC (rev 10170) @@ -154,6 +154,7 @@ # each driver in ${DRIVERS_LIST}. 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). + # Order is important here because of /usr/lib concerns. set( ${SOURCE_ROOT_NAME}_RPATH ${LIB_DIR} 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:55:53
|
Revision: 10203 http://plplot.svn.sourceforge.net/plplot/?rev=10203&view=rev Author: airwin Date: 2009-08-03 05:55:46 +0000 (Mon, 03 Aug 2009) Log Message: ----------- Fix build error for qt.so for the case when ENABLE_qt is OFF. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2009-08-03 05:53:43 UTC (rev 10202) +++ trunk/drivers/CMakeLists.txt 2009-08-03 05:55:46 UTC (rev 10203) @@ -30,6 +30,7 @@ ${CMAKE_SOURCE_DIR}/lib/qsastime ${CMAKE_SOURCE_DIR}/lib/nistcd ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ) @@ -82,7 +83,7 @@ PROPERTIES COMPILE_FLAGS "-DUSINGDLL" ) endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS) - if(SOURCE_ROOT_NAME STREQUAL "qt") + if(SOURCE_ROOT_NAME STREQUAL "qt" AND NOT ENABLE_qt) set(MOC_OPTIONS) if(PLD_bmpqt) list(APPEND MOC_OPTIONS -DPLD_bmpqt) @@ -114,24 +115,27 @@ if(PLD_extqt) list(APPEND MOC_OPTIONS -DPLD_extqt) endif(PLD_extqt) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/moc_files.h "/* Generated header file listing the moc generated files to include in plqt.cpp. */ \n#ifndef __MOC_FILES_H__\n#define __MOC_FILES_H__\n\n") if(MOC_OPTIONS) qt4_wrap_cpp( QT_MOC_OUTFILES ${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(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE} ${QT_MOC_OUTFILES}) + # 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}) + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/moc_files.h "#include \"${QT_MOC_OUTFILES}\"\n") + add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE}) + add_dependencies(${SOURCE_ROOT_NAME} moc_outfile_generated) else(MOC_OPTIONS) add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE}) endif(MOC_OPTIONS) - else(SOURCE_ROOT_NAME STREQUAL "qt") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/moc_files.h "#endif /* __MOC_FILES_H__i */ \n") + else(SOURCE_ROOT_NAME STREQUAL "qt" AND NOT ENABLE_qt) add_library(${SOURCE_ROOT_NAME} MODULE ${${SOURCE_ROOT_NAME}_SOURCE}) - endif(SOURCE_ROOT_NAME STREQUAL "qt") + endif(SOURCE_ROOT_NAME STREQUAL "qt" AND NOT ENABLE_qt) # ${SOURCE_ROOT_NAME}_LINK_FLAGS is ideally a list of the full path names # to libraries determined with find_library. However, the list can also This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-08-25 20:06:43
|
Revision: 10335 http://plplot.svn.sourceforge.net/plplot/?rev=10335&view=rev Author: airwin Date: 2009-08-25 20:06:36 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Export all driver targets for the DYNDRIVERS case. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2009-08-25 19:47:01 UTC (rev 10334) +++ trunk/drivers/CMakeLists.txt 2009-08-25 20:06:36 UTC (rev 10335) @@ -192,7 +192,12 @@ list(APPEND test_dyndrivers_TDEPENDS ${SOURCE_ROOT_NAME}) endif(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING) - install(TARGETS ${SOURCE_ROOT_NAME} DESTINATION ${DRV_DIR}) + install(TARGETS ${SOURCE_ROOT_NAME} + EXPORT export_plplot + DESTINATION ${DRV_DIR} + ) + install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc DESTINATION ${DRV_DIR} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2010-05-10 07:11:37
|
Revision: 10979 http://plplot.svn.sourceforge.net/plplot/?rev=10979&view=rev Author: smekal Date: 2010-05-10 07:11:30 +0000 (Mon, 10 May 2010) Log Message: ----------- For Windows test-drv-info.exe will be moved to the dll directory, where all the shared libraries are located. Therefore, test-drv-info will always be able to open the driver plugins (since they are in the same directory), even if the dll directory is not in the path. Compilation should then be always successful. In order to make the examples run the dll directory must still be in the PATH variable. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2010-05-09 05:18:08 UTC (rev 10978) +++ trunk/drivers/CMakeLists.txt 2010-05-10 07:11:30 UTC (rev 10979) @@ -47,21 +47,31 @@ plplot${LIB_TAG} ${LTDL_LIBRARIES} ) - set(test-drv-info_RPATH - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/src - ${CMAKE_BINARY_DIR}/lib/csa - ${CMAKE_BINARY_DIR}/lib/nn - ${CMAKE_BINARY_DIR}/lib/qsastime - ${libplplot${LIB_TAG}_RPATH} - ) + + # in windows we move test-drv-info to the dll directory + # otherwise we use the RPATH functionality + if(WIN32 AND NOT CYGWIN) + set_target_properties( + test-drv-info + PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/dll + ) + else(WIN32 AND NOT CYGWIN) + set(test-drv-info_RPATH + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR}/src + ${CMAKE_BINARY_DIR}/lib/csa + ${CMAKE_BINARY_DIR}/lib/nn + ${CMAKE_BINARY_DIR}/lib/qsastime + ${libplplot${LIB_TAG}_RPATH} + ) - set_target_properties( - test-drv-info - PROPERTIES - INSTALL_RPATH "${test-drv-info_RPATH}" - BUILD_WITH_INSTALL_RPATH ON - ) + set_target_properties( + test-drv-info + PROPERTIES + INSTALL_RPATH "${test-drv-info_RPATH}" + BUILD_WITH_INSTALL_RPATH ON + ) + endif(WIN32 AND NOT CYGWIN) get_target_property(test-drv-info_LOCATION test-drv-info LOCATION) set(test_dyndrivers_FDEPENDS) set(test_dyndrivers_TDEPENDS test-drv-info) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-05-10 17:05:24
|
Revision: 10982 http://plplot.svn.sourceforge.net/plplot/?rev=10982&view=rev Author: airwin Date: 2010-05-10 17:05:18 +0000 (Mon, 10 May 2010) Log Message: ----------- Implement a test target corresponding to every device driver. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2010-05-10 16:47:09 UTC (rev 10981) +++ trunk/drivers/CMakeLists.txt 2010-05-10 17:05:18 UTC (rev 10982) @@ -73,7 +73,6 @@ ) endif(WIN32 AND NOT CYGWIN) get_target_property(test-drv-info_LOCATION test-drv-info LOCATION) - set(test_dyndrivers_FDEPENDS) set(test_dyndrivers_TDEPENDS test-drv-info) endif(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING) @@ -185,7 +184,8 @@ LOCATION ) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc + OUTPUT + ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc COMMAND test-drv-info ${SOURCE_ROOT_NAME} > ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc @@ -196,10 +196,15 @@ ${${SOURCE_ROOT_NAME}_LOCATION} ${test-drv-info_LOCATION} ) - list(APPEND test_dyndrivers_FDEPENDS + add_custom_target(test_${SOURCE_ROOT_NAME} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc ) - list(APPEND test_dyndrivers_TDEPENDS ${SOURCE_ROOT_NAME}) + add_dependencies(test_${SOURCE_ROOT_NAME} + test-drv-info + ${SOURCE_ROOT_NAME} + ) + list(APPEND test_dyndrivers_TDEPENDS test_${SOURCE_ROOT_NAME}) endif(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING) install(TARGETS ${SOURCE_ROOT_NAME} @@ -213,7 +218,6 @@ endforeach(SOURCE_ROOT_NAME ${DRIVERS_LIST}) if(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING) add_custom_target(test_dyndrivers ALL - DEPENDS ${test_dyndrivers_FDEPENDS} ) add_dependencies(test_dyndrivers ${test_dyndrivers_TDEPENDS}) endif(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-05-10 17:10:01
|
Revision: 10983 http://plplot.svn.sourceforge.net/plplot/?rev=10983&view=rev Author: airwin Date: 2010-05-10 17:09:54 +0000 (Mon, 10 May 2010) Log Message: ----------- Use improved name (e.g., test_ps_driver rather than test_ps) for the target that tests a particular device driver. Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2010-05-10 17:05:18 UTC (rev 10982) +++ trunk/drivers/CMakeLists.txt 2010-05-10 17:09:54 UTC (rev 10983) @@ -196,15 +196,15 @@ ${${SOURCE_ROOT_NAME}_LOCATION} ${test-drv-info_LOCATION} ) - add_custom_target(test_${SOURCE_ROOT_NAME} + add_custom_target(test_${SOURCE_ROOT_NAME}_driver DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.rc ) - add_dependencies(test_${SOURCE_ROOT_NAME} + add_dependencies(test_${SOURCE_ROOT_NAME}_driver test-drv-info ${SOURCE_ROOT_NAME} ) - list(APPEND test_dyndrivers_TDEPENDS test_${SOURCE_ROOT_NAME}) + list(APPEND test_dyndrivers_TDEPENDS test_${SOURCE_ROOT_NAME}_driver) endif(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING) install(TARGETS ${SOURCE_ROOT_NAME} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-15 01:41:05
|
Revision: 13059 http://sourceforge.net/p/plplot/code/13059 Author: airwin Date: 2014-03-15 01:40:59 +0000 (Sat, 15 Mar 2014) Log Message: ----------- Use improved placement for the block of CMake code that might in the future create a dependency on the moc_outfile_generated target which is now available for both the Qt4 and Qt5 cases. Note this changed placement currently has no practical effect and is only for didactic reasons since this actual block of code is currently not executed (ANY_QT_DEVICE and NOT ENABLE_qt cannot currently be simultanously true). Modified Paths: -------------- trunk/drivers/CMakeLists.txt Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2014-03-15 00:28:58 UTC (rev 13058) +++ trunk/drivers/CMakeLists.txt 2014-03-15 01:40:59 UTC (rev 13059) @@ -118,14 +118,6 @@ ${${SOURCE_ROOT_NAME}_TARGETS} ) else(PLPLOT_USE_QT5) - if(NOT ENABLE_qt) - # Note this code is never executed considering the way the - # build system is set up now (see cmake/modules/qt.cmake), - # but nevertheless keep it for the future in case we ever - # want to deal with the case where we want to build the qt - # device without building the plplotqtd library - add_dependencies(${SOURCE_ROOT_NAME} moc_outfile_generated) - endif(NOT ENABLE_qt) if(NOT QT_LIBRARIES) message(FATAL_ERROR "Internal build system inconsistency. QT_LIBRARIESis empty but it should be populated") endif(NOT QT_LIBRARIES) @@ -140,6 +132,14 @@ # Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES set_qt_target_properties(${SOURCE_ROOT_NAME}) endif(PLPLOT_USE_QT5) + if(NOT ENABLE_qt) + # Note this code is never executed considering the way the + # build system is set up now (see cmake/modules/qt.cmake), + # but nevertheless keep it for the future in case we ever + # want to deal with the case where we want to build the qt + # device without building the plplotqtd library + add_dependencies(${SOURCE_ROOT_NAME} moc_outfile_generated) + endif(NOT ENABLE_qt) else(ANY_QT_DEVICE) message(FATAL_ERROR "Internal build system inconsistency. Attempt to build dynamic qt device when ANY_QT_DEVICE is false.") endif(ANY_QT_DEVICE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |