Revision: 55731
http://sourceforge.net/p/brlcad/code/55731
Author: starseeker
Date: 2013-06-12 19:42:51 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
CMake's install command doesn't preserve the executable flag with the FILES
option, so add a way to tell the macro it's installing a script.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/src/adrt/CMakeLists.txt
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2013-06-12 19:41:34 UTC
(rev 55730)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2013-06-12 19:42:51 UTC
(rev 55731)
@@ -602,7 +602,12 @@
# The installation rule relates only to the original source directory copy,
and so doesn't
# need to explicitly concern itself with configurations.
- install(FILES ${datalist} DESTINATION ${targetdir})
+ CHECK_OPT("EXEC" EXEC_INSTALL "${ARGN}")
+ if(EXEC_INSTALL)
+ install(PROGRAMS ${datalist} DESTINATION ${targetdir})
+ else(EXEC_INSTALL)
+ install(FILES ${datalist} DESTINATION ${targetdir})
+ endif(EXEC_INSTALL)
endmacro(BRLCAD_MANAGE_FILES)
Modified: brlcad/trunk/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/adrt/CMakeLists.txt 2013-06-12 19:41:34 UTC (rev
55730)
+++ brlcad/trunk/src/adrt/CMakeLists.txt 2013-06-12 19:42:51 UTC (rev
55731)
@@ -74,9 +74,9 @@
include(${BRLCAD_SOURCE_DIR}/misc/CMake/TCL_PKGINDEX.cmake)
TCL_PKGINDEX(issttcltk isst "0.1")
if(WIN32)
- BRLCAD_MANAGE_FILES("isst.bat" ${BIN_DIR})
+ BRLCAD_MANAGE_FILES("isst.bat" ${BIN_DIR} EXEC)
endif(WIN32)
- BRLCAD_MANAGE_FILES("isst" ${BIN_DIR})
+ BRLCAD_MANAGE_FILES("isst" ${BIN_DIR} EXEC)
endif(BRLCAD_ENABLE_OPENGL)
CMAKEFILES(isst_tcltk.c)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
