Revision: 70819
          http://sourceforge.net/p/brlcad/code/70819
Author:   starseeker
Date:     2018-03-13 14:50:50 +0000 (Tue, 13 Mar 2018)
Log Message:
-----------
Don't need to copy to the sh directory in CMAKE_BINARY_DIR - copying to bin is 
the important part.  In particular, the configure_file piece was marking files 
in the src directory for distcleaning when CMAKE_SOURCE_DIR == CMAKE_BINARY_DIR.

Modified Paths:
--------------
    brlcad/trunk/sh/CMakeLists.txt

Modified: brlcad/trunk/sh/CMakeLists.txt
===================================================================
--- brlcad/trunk/sh/CMakeLists.txt      2018-03-13 05:22:07 UTC (rev 70818)
+++ brlcad/trunk/sh/CMakeLists.txt      2018-03-13 14:50:50 UTC (rev 70819)
@@ -10,14 +10,12 @@
   )
 foreach(script ${sh_SCRIPTS})
   if(NOT CMAKE_CONFIGURATION_TYPES)
-    configure_file(${script} ${CMAKE_BINARY_DIR}/sh/${script} COPYONLY)
-    file(COPY ${CMAKE_BINARY_DIR}/sh/${script} DESTINATION 
${CMAKE_BINARY_DIR}/bin FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ 
GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+    file(COPY ${script} DESTINATION ${CMAKE_BINARY_DIR}/bin FILE_PERMISSIONS 
OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE 
WORLD_READ)
     DISTCLEAN("${CMAKE_BINARY_DIR}/bin/${script}")
   else(NOT CMAKE_CONFIGURATION_TYPES)
     foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
-      configure_file(${script} 
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/sh/${script} COPYONLY)
-      file(COPY ${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/sh/${script} DESTINATION 
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/bin FILE_PERMISSIONS OWNER_EXECUTE 
OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+      file(COPY ${script} DESTINATION 
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/bin FILE_PERMISSIONS OWNER_EXECUTE 
OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
       DISTCLEAN("${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/bin/${script}")
     endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
   endif(NOT CMAKE_CONFIGURATION_TYPES)

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


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to