From: <ai...@us...> - 2009-09-30 17:00:56
|
Revision: 10495 http://plplot.svn.sourceforge.net/plplot/?rev=10495&view=rev Author: airwin Date: 2009-09-30 17:00:35 +0000 (Wed, 30 Sep 2009) Log Message: ----------- if(TARGET ...) signature is not implemented for CMake-2.6.0 so replace by equivalent but more complicated logic using GLOBAL properties. Note, we will probably want to move back to the if(TARGET ...) approach once we bump our minimum version from 2.6.0 to 2.6.4. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/c/CMakeLists.txt trunk/examples/c++/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-09-29 23:01:18 UTC (rev 10494) +++ trunk/examples/CMakeLists.txt 2009-09-30 17:00:35 UTC (rev 10495) @@ -491,6 +491,7 @@ # noninteractive_devices_info_LIST set in plplot_configure.cmake. Each list # member consists of a colon-separated device name and a Boolean variable # that indicates if device has familied output in plplot-test.sh. + foreach(noninteractive_devices_info ${noninteractive_devices_info_LIST}) string(REGEX REPLACE "^(.*):.*$" "\\1" device ${noninteractive_devices_info}) string(REGEX REPLACE "^.*:(.*)$" "\\1" familied ${noninteractive_devices_info}) @@ -534,29 +535,35 @@ list(APPEND interactive_targets_LIST ${targets_examples_tk}) endif(targets_examples_tk) - if(TARGET plplotcanvas_demo) - list(APPEND interactive_targets_LIST plplotcanvas_demo) - endif(TARGET plplotcanvas_demo) + get_property(target_plplotcanvas_demo GLOBAL PROPERTY TARGET_plplotcanvas_demo) + if(target_plplotcanvas_demo) + list(APPEND interactive_targets_LIST ${target_plplotcanvas_demo}) + endif(target_plplotcanvas_demo) - if(TARGET plplotcanvas_animation) - list(APPEND interactive_targets_LIST plplotcanvas_animation) - endif(TARGET plplotcanvas_animation) + get_property(target_plplotcanvas_animation GLOBAL PROPERTY TARGET_plplotcanvas_animation) + if(target_plplotcanvas_animation) + list(APPEND interactive_targets_LIST ${target_plplotcanvas_animation}) + endif(target_plplotcanvas_animation) - if(TARGET extXdrawable_demo) - list(APPEND interactive_targets_LIST extXdrawable_demo) - endif(TARGET extXdrawable_demo) + get_property(target_extXdrawable_demo GLOBAL PROPERTY TARGET_extXdrawable_demo) + if(target_extXdrawable_demo) + list(APPEND interactive_targets_LIST ${target_extXdrawable_demo}) + endif(target_extXdrawable_demo) - if(TARGET ext-cairo-test) - list(APPEND interactive_targets_LIST ext-cairo-test) - endif(TARGET ext-cairo-test) + get_property(target_ext-cairo-test GLOBAL PROPERTY TARGET_ext-cairo-test) + if(target_ext-cairo-test) + list(APPEND interactive_targets_LIST ${target_ext-cairo-test}) + endif(target_ext-cairo-test) - if(TARGET wxPLplotDemo) - list(APPEND interactive_targets_LIST wxPLplotDemo) - endif(TARGET wxPLplotDemo) + get_property(target_wxPLplotDemo GLOBAL PROPERTY TARGET_wxPLplotDemo) + if(target_wxPLplotDemo) + list(APPEND interactive_targets_LIST ${target_wxPLplotDemo}) + endif(target_wxPLplotDemo) - if(TARGET qt_example) - list(APPEND interactive_targets_LIST qt_example) - endif(TARGET qt_example) + get_property(target_qt_example GLOBAL PROPERTY TARGET_qt_example) + if(target_qt_example) + list(APPEND interactive_targets_LIST ${target_qt_example}) + endif(target_qt_example) add_custom_target(test_interactive COMMAND SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR} EXAMPLES_DIR=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test-interactive.sh Modified: trunk/examples/c/CMakeLists.txt =================================================================== --- trunk/examples/c/CMakeLists.txt 2009-09-29 23:01:18 UTC (rev 10494) +++ trunk/examples/c/CMakeLists.txt 2009-09-30 17:00:35 UTC (rev 10495) @@ -156,6 +156,7 @@ ) add_executable(plplotcanvas_demo plplotcanvas_demo.c) target_link_libraries(plplotcanvas_demo ${GNOMEPRINTUI_LINK_FLAGS} plplotgnome2${LIB_TAG}) + set_property(GLOBAL PROPERTY TARGET_plplotcanvas_demo plplotcanvas_demo) # plplotcanvas_animation.c contains a reference to gthread_init and also # contains '#include <glib.h>'. Analysis shows both these issues are @@ -171,6 +172,7 @@ ) add_executable(plplotcanvas_animation plplotcanvas_animation.c) target_link_libraries(plplotcanvas_animation ${GNOMEPRINTUI_LINK_FLAGS} ${GTHREAD_2.0_LINK_FLAGS} plplotgnome2${LIB_TAG} ${MATH_LIB}) + set_property(GLOBAL PROPERTY TARGET_plplotcanvas_animation plplotcanvas_animation) else(linkflags2) message(STATUS "WARNING: gthread-2.0 not found. plplotcanvas_animation not built") endif(linkflags2) @@ -191,6 +193,7 @@ ) add_executable(extXdrawable_demo extXdrawable_demo.c) target_link_libraries(extXdrawable_demo ${GTK_X11_LINK_FLAGS} plplot${LIB_TAG}) + set_property(GLOBAL PROPERTY TARGET_extXdrawable_demo extXdrawable_demo) else(linkflags3) message(STATUS "WARNING: gtk+-x11-2.0 not found. extXdrawable_demo not built.") endif(linkflags3) @@ -208,6 +211,7 @@ ) add_executable(ext-cairo-test ext-cairo-test.c) target_link_libraries(ext-cairo-test ${CAIRO_LINK_FLAGS} plplot${LIB_TAG}) + set_property(GLOBAL PROPERTY TARGET_ext-cairo-test ext-cairo-test) else(linkflags4) message(STATUS "WARNING: cairo not found. ext-cairo-test not built.") endif(linkflags4) Modified: trunk/examples/c++/CMakeLists.txt =================================================================== --- trunk/examples/c++/CMakeLists.txt 2009-09-29 23:01:18 UTC (rev 10494) +++ trunk/examples/c++/CMakeLists.txt 2009-09-30 17:00:35 UTC (rev 10495) @@ -138,6 +138,7 @@ endif(CORE_BUILD) add_executable(wxPLplotDemo WIN32 wxPLplotDemo.cpp) target_link_libraries(wxPLplotDemo plplotwxwidgets${LIB_TAG} plplotcxx${LIB_TAG} ${MATH_LIB}) + set_property(GLOBAL PROPERTY TARGET_wxPLplotDemo wxPLplotDemo) endif(ENABLE_wxwidgets) if(ENABLE_qt) @@ -183,6 +184,7 @@ ) add_executable(qt_example qt_example.cpp qt_PlotWindow.cpp ${QT_MOC_OUTFILES}) target_link_libraries(qt_example ${QT_LIBRARIES} plplotqt${LIB_TAG} plplot${LIB_TAG}) + set_property(GLOBAL PROPERTY TARGET_qt_example qt_example) endif(BUILD_qt_example) endif(ENABLE_qt) endif(BUILD_TEST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |