[Plplot-cvs] SF.net SVN: plplot:[10979] trunk/drivers/CMakeLists.txt

[<sm...@us...>]

Revision: 10979
          http://plplot.svn.sourceforge.net/plplot/?rev=10979&view=rev
Author:   smekal
Date:     2010-05-10 07:11:30 +0000 (Mon, 10 May 2010)

Log Message:
-----------
For Windows test-drv-info.exe will be moved to the dll directory, where all the shared libraries are located. Therefore, test-drv-info will always be able to open the driver plugins (since they are in the same directory), even if the dll directory is not in the path. Compilation should then be always successful. In order to make the examples run the dll directory must still be in the PATH variable.

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

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2010-05-09 05:18:08 UTC (rev 10978)
+++ trunk/drivers/CMakeLists.txt	2010-05-10 07:11:30 UTC (rev 10979)
@@ -47,21 +47,31 @@
       plplot${LIB_TAG}
       ${LTDL_LIBRARIES}
       )
-    set(test-drv-info_RPATH
-      ${CMAKE_CURRENT_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}/src
-      ${CMAKE_BINARY_DIR}/lib/csa
-      ${CMAKE_BINARY_DIR}/lib/nn
-      ${CMAKE_BINARY_DIR}/lib/qsastime
-      ${libplplot${LIB_TAG}_RPATH}
-      )
+
+    # in windows we move test-drv-info to the dll directory
+    # otherwise we use the RPATH functionality
+    if(WIN32 AND NOT CYGWIN)
+      set_target_properties(
+	test-drv-info
+	PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/dll
+	)
+    else(WIN32 AND NOT CYGWIN)
+      set(test-drv-info_RPATH
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_BINARY_DIR}/src
+        ${CMAKE_BINARY_DIR}/lib/csa
+        ${CMAKE_BINARY_DIR}/lib/nn
+        ${CMAKE_BINARY_DIR}/lib/qsastime
+        ${libplplot${LIB_TAG}_RPATH}
+        )
     
-    set_target_properties(
-      test-drv-info
-      PROPERTIES
-      INSTALL_RPATH "${test-drv-info_RPATH}"
-      BUILD_WITH_INSTALL_RPATH ON
-      )
+      set_target_properties(
+        test-drv-info
+        PROPERTIES
+        INSTALL_RPATH "${test-drv-info_RPATH}"
+        BUILD_WITH_INSTALL_RPATH ON
+        )
+    endif(WIN32 AND NOT CYGWIN)
     get_target_property(test-drv-info_LOCATION test-drv-info LOCATION)
     set(test_dyndrivers_FDEPENDS)
     set(test_dyndrivers_TDEPENDS test-drv-info)


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