[vlmc-devel] commit: CMakeLists.txt: Comment out INSTALL code, that installs nothing but creates (Rohit Yadav )

git at videolan.org git at videolan.org
Fri Oct 1 04:18:22 CEST 2010


vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Fri Oct  1 07:57:49 2010 +0530| [43e161c2620e4857918dfe3f472cdc6a24676983] | committer: Rohit Yadav 

CMakeLists.txt: Comment out INSTALL code, that installs nothing but creates
an empty directory in the VLMC Data directory. We may use custom commands which are already
above the commented code to install specific files to the data directory etc. in future,
instead of a general command that may fail.
Fix git patch version typos.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=43e161c2620e4857918dfe3f472cdc6a24676983
---

 CMakeLists.txt |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38489b5..f484ef5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,8 @@ IF(GIT)
         COMMAND ${GIT} rev-parse --short HEAD 
         OUTPUT_VARIABLE GIT_OUT OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    SET(PROJECT_VERSION_PATCH "${GIT_OUT}git")
-    MESSAGE(STATUS "Git Version Patch: git_${GIT_OUT}")
+    SET(PROJECT_VERSION_PATCH "${GIT_OUT}-git")
+    MESSAGE(STATUS "Git Version Patch: ${GIT_OUT}")
 ELSE(GIT)
     SET(GIT_OUT 0)
 ENDIF(GIT)
@@ -211,12 +211,12 @@ INSTALL (FILES share/vlmc.desktop DESTINATION ${VLMC_DESKTOP_DIR})
 # Copy the VLMC pixmap
 INSTALL (FILES share/vlmc.png DESTINATION ${VLMC_PIXMAPS_DIR})
 
-# Copy the share directory
-INSTALL (DIRECTORY share/ DESTINATION ${VLMC_DATA_DIR}
-         PATTERN "*.desktop" EXCLUDE
-         PATTERN "*.ico" EXCLUDE
-         PATTERN "*.icns" EXCLUDE
-         PATTERN "vlmc.png" EXCLUDE)
+# Copy the share directory (TODO: add checks if the dir is empty, don't install)
+# INSTALL (DIRECTORY share/ DESTINATION ${VLMC_DATA_DIR}
+#         PATTERN "*.desktop" EXCLUDE
+#         PATTERN "*.ico" EXCLUDE
+#         PATTERN "*.icns" EXCLUDE
+#         PATTERN "vlmc.png" EXCLUDE)
 
 #############################################################
 # Package Settings



More information about the Vlmc-devel mailing list