Revision: 55770
http://sourceforge.net/p/brlcad/code/55770
Author: starseeker
Date: 2013-06-13 21:47:08 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Use the new feature in BRLCAD_MANAGE_FILES to greatly simplify archer CMake
logic
Modified Paths:
--------------
brlcad/trunk/src/archer/CMakeLists.txt
Modified: brlcad/trunk/src/archer/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/archer/CMakeLists.txt 2013-06-13 21:39:27 UTC (rev
55769)
+++ brlcad/trunk/src/archer/CMakeLists.txt 2013-06-13 21:47:08 UTC (rev
55770)
@@ -1,43 +1,11 @@
-if(HAVE_SYMLINK)
- if(NOT CMAKE_CONFIGURATION_TYPES)
- execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}/archer ${CMAKE_BINARY_DIR}/${BIN_DIR}/archer)
- set(archer_cmd_outputs ${CMAKE_BINARY_DIR}/${BIN_DIR}/archer)
- else(NOT CMAKE_CONFIGURATION_TYPES)
- foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}/archer
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/archer)
- set(archer_cmd_outputs ${archer_cmd_outputs}
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/archer)
- endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- endif(NOT CMAKE_CONFIGURATION_TYPES)
-else(HAVE_SYMLINK)
- if(NOT CMAKE_CONFIGURATION_TYPES)
- add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/${BIN_DIR}/archer
${CMAKE_BINARY_DIR}/${BIN_DIR}/archer.bat
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/archer.bat ${CMAKE_BINARY_DIR}/${BIN_DIR}/archer.bat
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/archer ${CMAKE_BINARY_DIR}/${BIN_DIR}/archer
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/archer
${CMAKE_CURRENT_SOURCE_DIR}/archer.bat
- )
- set(archer_cmd_outputs ${CMAKE_BINARY_DIR}/${BIN_DIR}/archer
${CMAKE_BINARY_DIR}/${BIN_DIR}/archer.bat)
- else(NOT CMAKE_CONFIGURATION_TYPES)
- foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/archer
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/archer.bat
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/archer.bat
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/archer.bat
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/archer
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/archer
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/archer
${CMAKE_CURRENT_SOURCE_DIR}/archer.bat
- )
- set(archer_cmd_outputs ${archer_cmd_outputs}
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/archer
${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/archer.bat)
- endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- endif(NOT CMAKE_CONFIGURATION_TYPES)
- install(PROGRAMS archer.bat DESTINATION ${BIN_DIR})
-endif(HAVE_SYMLINK)
-add_custom_target(archer ALL DEPENDS ${archer_cmd_outputs})
-install(PROGRAMS archer DESTINATION bin)
-DISTCLEAN(${archer_cmd_outputs})
+if(WIN32)
+ BRLCAD_MANAGE_FILES("archer.bat" ${BIN_DIR} EXEC)
+endif(WIN32)
+BRLCAD_MANAGE_FILES("archer" ${BIN_DIR} EXEC)
# archer depends on the creation/installation of all the
# tclscripts.
+add_custom_target(archer ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/archer)
foreach(item ${pkgIndex_target_list})
add_dependencies(archer ${item})
endforeach(item ${pkgIndex_target_list})
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
