Revision: 77626
http://sourceforge.net/p/brlcad/code/77626
Author: starseeker
Date: 2020-10-24 01:58:28 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
configure_file once, not once per config
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMakeLists.txt
Modified: brlcad/branches/extbuild/misc/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/misc/CMakeLists.txt 2020-10-24 01:44:02 UTC
(rev 77625)
+++ brlcad/branches/extbuild/misc/CMakeLists.txt 2020-10-24 01:58:28 UTC
(rev 77626)
@@ -24,16 +24,16 @@
file(REMOVE ${CMAKE_BINARY_DIR}/misc/brlcad-config)
install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/brlcad-config DESTINATION
${BIN_DIR})
else(NOT CMAKE_CONFIGURATION_TYPES)
+ configure_file(brlcad-config.in ${CMAKE_BINARY_DIR}/CMakeTmp/brlcad-config
@ONLY)
foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- configure_file(brlcad-config.in
${CMAKE_BINARY_DIR}/${CFG_TYPE_UPPER}/misc/brlcad-config @ONLY)
- file(COPY ${CMAKE_BINARY_DIR}/${CFG_TYPE_UPPER}/misc/brlcad-config
+ file(COPY ${CMAKE_BINARY_DIR}/CMakeTmp/brlcad-config
DESTINATION ${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
DISTCLEAN(${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/brlcad-config)
- file(REMOVE ${CMAKE_BINARY_DIR}/${CFG_TYPE_UPPER}/misc/brlcad-config)
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+ file(REMOVE ${CMAKE_BINARY_DIR}/CMakeTmp/brlcad-config)
install(PROGRAMS ${CMAKE_BINARY_DIR}/\${BUILD_TYPE}/bin/brlcad-config
DESTINATION ${BIN_DIR})
endif(NOT CMAKE_CONFIGURATION_TYPES)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
