From: <sm...@us...> - 2008-01-31 09:19:25
|
Revision: 8200 http://plplot.svn.sourceforge.net/plplot/?rev=8200&view=rev Author: smekal Date: 2008-01-31 01:19:30 -0800 (Thu, 31 Jan 2008) Log Message: ----------- wxPLplotDemo is now also built together with the c++ examples after compilation of plplot if -DBUILD_TEST=ON was set as cmake option and if wxWidgets was found. Modified Paths: -------------- trunk/examples/c++/CMakeLists.txt Modified: trunk/examples/c++/CMakeLists.txt =================================================================== --- trunk/examples/c++/CMakeLists.txt 2008-01-31 09:17:35 UTC (rev 8199) +++ trunk/examples/c++/CMakeLists.txt 2008-01-31 09:19:30 UTC (rev 8200) @@ -69,13 +69,29 @@ if(BUILD_TEST) add_executable(x${STRING_INDEX} x${STRING_INDEX}.cc) if(WIN32 AND BUILD_SHARED_LIBS) - SET_SOURCE_FILES_PROPERTIES(x${STRING_INDEX}.cc - PROPERTIES COMPILE_FLAGS "-DUSINGDLL" ) + SET_SOURCE_FILES_PROPERTIES(x${STRING_INDEX}.cc + PROPERTIES COMPILE_FLAGS "-DUSINGDLL") endif(WIN32 AND BUILD_SHARED_LIBS) target_link_libraries(x${STRING_INDEX} plplotcxx${LIB_TAG} ${MATH_LIB}) endif(BUILD_TEST) endforeach(STRING_INDEX ${cxx_STRING_INDICES}) +if(PLD_wxwidgets) + if(BUILD_TEST) + add_executable(wxPLplotDemo wxPLplotDemo.cpp) + SET_SOURCE_FILES_PROPERTIES(wxPLplotDemo.cpp + PROPERTIES COMPILE_FLAGS ${wxwidgets_COMPILE_FLAGS}) + if(WIN32 AND BUILD_SHARED_LIBS) + SET_SOURCE_FILES_PROPERTIES(wxPLplotDemo.cpp + PROPERTIES COMPILE_FLAGS "-DUSINGDLL") + endif(WIN32 AND BUILD_SHARED_LIBS) + target_link_libraries(wxPLplotDemo plplotwxwidgets${LIB_TAG} plplotcxx${LIB_TAG} ${MATH_LIB}) + include_directories( + ${CMAKE_SOURCE_DIR}/bindings/wxwidgets + ${CMAKE_BINARY_DIR}/bindings/wxwidgets + ) + endif(BUILD_TEST) +endif(PLD_wxwidgets) set(wxPLplotDemo_SRCS wxPLplotDemo.cpp ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |