From: <ai...@us...> - 2009-09-15 18:22:21
|
Revision: 10413 http://plplot.svn.sourceforge.net/plplot/?rev=10413&view=rev Author: airwin Date: 2009-09-15 18:22:02 +0000 (Tue, 15 Sep 2009) Log Message: ----------- Put 'remove_definitions("-DHAVE_CONFIG_H")' in examples directory so it applies to all examples rather than specifying it in individual examples subdirectories. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/ada/CMakeLists.txt trunk/examples/c/CMakeLists.txt trunk/examples/c++/CMakeLists.txt trunk/examples/d/CMakeLists.txt trunk/examples/f77/CMakeLists.txt trunk/examples/f95/CMakeLists.txt trunk/examples/tk/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-09-15 16:11:51 UTC (rev 10412) +++ trunk/examples/CMakeLists.txt 2009-09-15 18:22:02 UTC (rev 10413) @@ -25,6 +25,10 @@ # BUILD_TEST ON and CORE_BUILD OFF. if(CORE_BUILD) + if(BUILD_TEST) + remove_definitions("-DHAVE_CONFIG_H") + endif(BUILD_TEST) + # Sort out RPATH issues for traditional build of installed examples using # */Makefiles configured in each * subdirectory from */Makefile.examples.in. if(USE_RPATH) Modified: trunk/examples/ada/CMakeLists.txt =================================================================== --- trunk/examples/ada/CMakeLists.txt 2009-09-15 16:11:51 UTC (rev 10412) +++ trunk/examples/ada/CMakeLists.txt 2009-09-15 18:22:02 UTC (rev 10413) @@ -119,7 +119,6 @@ if(BUILD_TEST) if(CORE_BUILD) - remove_definitions("-DHAVE_CONFIG_H") include_directories( ${CMAKE_BINARY_DIR}/examples/ada ${CMAKE_BINARY_DIR}/bindings/ada Modified: trunk/examples/c/CMakeLists.txt =================================================================== --- trunk/examples/c/CMakeLists.txt 2009-09-15 16:11:51 UTC (rev 10412) +++ trunk/examples/c/CMakeLists.txt 2009-09-15 18:22:02 UTC (rev 10413) @@ -114,7 +114,6 @@ if(BUILD_TEST) if(CORE_BUILD) - remove_definitions("-DHAVE_CONFIG_H") include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include Modified: trunk/examples/c++/CMakeLists.txt =================================================================== --- trunk/examples/c++/CMakeLists.txt 2009-09-15 16:11:51 UTC (rev 10412) +++ trunk/examples/c++/CMakeLists.txt 2009-09-15 18:22:02 UTC (rev 10413) @@ -94,7 +94,6 @@ if(BUILD_TEST) if(CORE_BUILD) - remove_definitions("-DHAVE_CONFIG_H") include_directories( ${CMAKE_SOURCE_DIR}/bindings/c++ ${CMAKE_SOURCE_DIR}/include Modified: trunk/examples/d/CMakeLists.txt =================================================================== --- trunk/examples/d/CMakeLists.txt 2009-09-15 16:11:51 UTC (rev 10412) +++ trunk/examples/d/CMakeLists.txt 2009-09-15 18:22:02 UTC (rev 10413) @@ -87,7 +87,6 @@ if(BUILD_TEST) if(CORE_BUILD) - remove_definitions("-DHAVE_CONFIG_H") include_directories( ${CMAKE_SOURCE_DIR}/bindings/d ) Modified: trunk/examples/f77/CMakeLists.txt =================================================================== --- trunk/examples/f77/CMakeLists.txt 2009-09-15 16:11:51 UTC (rev 10412) +++ trunk/examples/f77/CMakeLists.txt 2009-09-15 18:22:02 UTC (rev 10413) @@ -126,7 +126,6 @@ if(BUILD_TEST) if(CORE_BUILD) - remove_definitions("-DHAVE_CONFIG_H") include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include Modified: trunk/examples/f95/CMakeLists.txt =================================================================== --- trunk/examples/f95/CMakeLists.txt 2009-09-15 16:11:51 UTC (rev 10412) +++ trunk/examples/f95/CMakeLists.txt 2009-09-15 18:22:02 UTC (rev 10413) @@ -107,7 +107,6 @@ if(BUILD_TEST) if(CORE_BUILD) - remove_definitions("-DHAVE_CONFIG_H") # For CMake-2.6.0 and above, the module files are created by # default during the library build in the bindings/f95 directory. Modified: trunk/examples/tk/CMakeLists.txt =================================================================== --- trunk/examples/tk/CMakeLists.txt 2009-09-15 16:11:51 UTC (rev 10412) +++ trunk/examples/tk/CMakeLists.txt 2009-09-15 18:22:02 UTC (rev 10413) @@ -159,7 +159,6 @@ if(BUILD_TEST) if(CORE_BUILD) - remove_definitions("-DHAVE_CONFIG_H") include_directories( ${TCL_INCLUDE_PATH} ${TK_INCLUDE_PATH} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |