[Plplot-cvs] SF.net SVN: plplot: [7666] trunk/examples

[<ai...@us...>]

Revision: 7666
          http://plplot.svn.sourceforge.net/plplot/?rev=7666&view=rev
Author:   airwin
Date:     2007-04-10 22:22:00 -0700 (Tue, 10 Apr 2007)

Log Message:
-----------
Remove useless ENABLE_BUILDTREE_EXAMPLES logic.

Modified Paths:
--------------
    trunk/examples/c/CMakeLists.txt
    trunk/examples/c++/CMakeLists.txt
    trunk/examples/f77/CMakeLists.txt
    trunk/examples/f95/CMakeLists.txt

Modified: trunk/examples/c/CMakeLists.txt
===================================================================
--- trunk/examples/c/CMakeLists.txt	2007-04-11 00:29:17 UTC (rev 7665)
+++ trunk/examples/c/CMakeLists.txt	2007-04-11 05:22:00 UTC (rev 7666)
@@ -53,21 +53,20 @@
 "27"
 )
 
-set(ENABLE_BUILDTREE_EXAMPLES ON)
-if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+if(BUILD_TEST)
   remove_definitions("-DHAVE_CONFIG_H")
   include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
-endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+endif(BUILD_TEST)
 foreach(STRING_INDEX ${c_STRING_INDICES})
   set(c_SRCS ${c_SRCS} x${STRING_INDEX}c.c)
-  if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+  if(BUILD_TEST)
     add_executable(x${STRING_INDEX}c x${STRING_INDEX}c.c)
     if(WIN32 AND BUILD_SHARED_LIBS)
         SET_SOURCE_FILES_PROPERTIES(x${STRING_INDEX}c.c
           PROPERTIES COMPILE_FLAGS "-DUSINGDLL" )
     endif(WIN32 AND BUILD_SHARED_LIBS)
     target_link_libraries(x${STRING_INDEX}c plplot${LIB_TAG} ${MATH_LIB})
-  endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+  endif(BUILD_TEST)
 endforeach(STRING_INDEX ${c_STRING_INDICES})
 
 set(plplotcanvas_SRCS

Modified: trunk/examples/c++/CMakeLists.txt
===================================================================
--- trunk/examples/c++/CMakeLists.txt	2007-04-11 00:29:17 UTC (rev 7665)
+++ trunk/examples/c++/CMakeLists.txt	2007-04-11 05:22:00 UTC (rev 7666)
@@ -53,25 +53,24 @@
 "26"
 )
 
-set(ENABLE_BUILDTREE_EXAMPLES ON)
-if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+if(BUILD_TEST)
   remove_definitions("-DHAVE_CONFIG_H")
   include_directories(
   ${CMAKE_SOURCE_DIR}/bindings/c++
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_BINARY_DIR}/include
   )
-endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+endif(BUILD_TEST)
 foreach(STRING_INDEX ${cxx_STRING_INDICES})
   set(cxx_SRCS ${cxx_SRCS} x${STRING_INDEX}.cc)
-  if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+  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" )
     endif(WIN32 AND BUILD_SHARED_LIBS)
     target_link_libraries(x${STRING_INDEX} plplotcxx${LIB_TAG} ${MATH_LIB})
-  endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+  endif(BUILD_TEST)
 endforeach(STRING_INDEX ${cxx_STRING_INDICES})
 
 set(wxPLplotDemo_SRCS

Modified: trunk/examples/f77/CMakeLists.txt
===================================================================
--- trunk/examples/f77/CMakeLists.txt	2007-04-11 00:29:17 UTC (rev 7665)
+++ trunk/examples/f77/CMakeLists.txt	2007-04-11 05:22:00 UTC (rev 7666)
@@ -70,16 +70,15 @@
   endforeach(STRING_INDEX ${f77_STRING_INDICES})
 endif(PL_DOUBLE)
 
-set(ENABLE_BUILDTREE_EXAMPLES ON)
-if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+if(BUILD_TEST)
   remove_definitions("-DHAVE_CONFIG_H")
   include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
-endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+endif(BUILD_TEST)
 foreach(STRING_INDEX ${f77_STRING_INDICES})
-  if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+  if(BUILD_TEST)
     add_executable(x${STRING_INDEX}f ${CMAKE_CURRENT_BINARY_DIR}/x${STRING_INDEX}f.f)
     target_link_libraries(x${STRING_INDEX}f plplotf77${LIB_TAG})
-  endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+  endif(BUILD_TEST)
 endforeach(STRING_INDEX ${f77_STRING_INDICES})
 
 add_custom_target(f77_examples ALL DEPENDS ${f77_SRCS})

Modified: trunk/examples/f95/CMakeLists.txt
===================================================================
--- trunk/examples/f95/CMakeLists.txt	2007-04-11 00:29:17 UTC (rev 7665)
+++ trunk/examples/f95/CMakeLists.txt	2007-04-11 05:22:00 UTC (rev 7666)
@@ -45,8 +45,7 @@
 "23"
 )
 
-set(ENABLE_BUILDTREE_EXAMPLES ON)
-if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+if(BUILD_TEST)
   remove_definitions("-DHAVE_CONFIG_H")
   # N.B. This is required because it's the location of plplot.mod
   # generated as a by-product of building libplplotf95${LIB_TAG}.
@@ -64,13 +63,13 @@
   ${CMAKE_BINARY_DIR}/plplot.mod.proxy
   COPYONLY
   )
-endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+endif(BUILD_TEST)
 foreach(STRING_INDEX ${f95_STRING_INDICES})
   set(f95_SRCS ${f95_SRCS} x${STRING_INDEX}f.f90)
-  if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+  if(BUILD_TEST)
     add_executable(x${STRING_INDEX}f x${STRING_INDEX}f.f90)
     target_link_libraries(x${STRING_INDEX}f plplotf95${LIB_TAG})
-  endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES)
+  endif(BUILD_TEST)
 endforeach(STRING_INDEX ${f95_STRING_INDICES})
 
 install(FILES ${f95_SRCS} 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.