[Plplot-cvs] SF.net SVN: plplot:[12414] trunk

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

Revision: 12414
          http://sourceforge.net/p/plplot/code/12414
Author:   airwin
Date:     2013-07-10 16:20:21 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Make treatment of the dll directory consistent with the rest of the
build-system logic.  In other words, only use dll for the
WIN32_AND_NOT_CYGWIN case.

Modified Paths:
--------------
    trunk/drivers/CMakeLists.txt
    trunk/examples/lua/CMakeLists.txt

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2013-07-10 15:58:05 UTC (rev 12413)
+++ trunk/drivers/CMakeLists.txt	2013-07-10 16:20:21 UTC (rev 12414)
@@ -50,12 +50,12 @@
 
     # in windows we move test-drv-info to the dll directory
     # otherwise we use the RPATH functionality
-    if(WIN32_OR_CYGWIN)
+    if(WIN32_AND_NOT_CYGWIN)
       set_target_properties(
 	test-drv-info
 	PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/dll
 	)
-    else(WIN32_OR_CYGWIN)
+    else(WIN32_AND_NOT_CYGWIN)
       set(test-drv-info_RPATH
         ${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_BINARY_DIR}/src
@@ -71,7 +71,7 @@
         INSTALL_RPATH "${test-drv-info_RPATH}"
         BUILD_WITH_INSTALL_RPATH ON
         )
-    endif(WIN32_OR_CYGWIN)
+    endif(WIN32_AND_NOT_CYGWIN)
     get_target_property(test-drv-info_LOCATION test-drv-info LOCATION)
     set(test_dyndrivers_TDEPENDS test-drv-info)
 

Modified: trunk/examples/lua/CMakeLists.txt
===================================================================
--- trunk/examples/lua/CMakeLists.txt	2013-07-10 15:58:05 UTC (rev 12413)
+++ trunk/examples/lua/CMakeLists.txt	2013-07-10 16:20:21 UTC (rev 12414)
@@ -102,11 +102,11 @@
     set_property(GLOBAL PROPERTY FILES_examples_lua ${command_DEPENDS})
   endif(BUILD_TEST)
 
-  if(WIN32_OR_CYGWIN)
+  if(WIN32_AND_NOT_CYGWIN)
     set(lua_lib_location ${CMAKE_BINARY_DIR}/dll)
-  else(WIN32_OR_CYGWIN)
+  else(WIN32_AND_NOT_CYGWIN)
     set(lua_lib_location ${CMAKE_BINARY_DIR}/bindings/lua)
-  endif(WIN32_OR_CYGWIN)
+  endif(WIN32_AND_NOT_CYGWIN)
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/plplot_examples.lua.in
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_examples.lua

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