[Orxonox-commit 3857] r8531 - code/trunk/data

adrfried at orxonox.net adrfried at orxonox.net
Sun May 22 23:26:37 CEST 2011


Author: adrfried
Date: 2011-05-22 23:26:37 +0200 (Sun, 22 May 2011)
New Revision: 8531

Modified:
   code/trunk/data/CMakeLists.txt
Log:
skip external data directory if it was not found

* this is useful if the external data gets installed with a separate
  package.
* also fixed the exclude regexp.

Modified: code/trunk/data/CMakeLists.txt
===================================================================
--- code/trunk/data/CMakeLists.txt	2011-05-22 19:51:15 UTC (rev 8530)
+++ code/trunk/data/CMakeLists.txt	2011-05-22 21:26:37 UTC (rev 8531)
@@ -55,8 +55,11 @@
   REGEX "\\.svn$|_svn$|CMakeLists.txt|InstallScript.cmake" EXCLUDE
 )
 # External directory
-INSTALL(
-  DIRECTORY ${EXTERNAL_DATA_DIRECTORY}/
-  DESTINATION ${DATA_INSTALL_DIRECTORY}
-  REGEX "\\.svn$|_svn$|" EXCLUDE
-)
+# User may want to install separately, ignore if not found.
+IF(EXISTS ${EXTERNAL_DATA_DIRECTORY})
+  INSTALL(
+    DIRECTORY ${EXTERNAL_DATA_DIRECTORY}/
+    DESTINATION ${DATA_INSTALL_DIRECTORY}
+    REGEX "\\.svn$|_svn$" EXCLUDE
+  )
+ENDIF()




More information about the Orxonox-commit mailing list