Revision: 40570
http://brlcad.svn.sourceforge.net/brlcad/?rev=40570&view=rev
Author: starseeker
Date: 2010-09-15 03:49:13 +0000 (Wed, 15 Sep 2010)
Log Message:
-----------
Ah - configure_file has an option to only use @var@ syntax, which should make
it compatible with the autotools .in files. Now it's just a question of
defining what those files need in the way of variables.
Modified Paths:
--------------
brlcad/branches/cmake/doc/CMakeLists.txt
brlcad/branches/cmake/misc/CMakeLists.txt
brlcad/branches/cmake/misc/pkgconfig/CMakeLists.txt
brlcad/branches/cmake/src/brlman/CMakeLists.txt
Modified: brlcad/branches/cmake/doc/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/CMakeLists.txt 2010-09-14 22:46:36 UTC (rev
40569)
+++ brlcad/branches/cmake/doc/CMakeLists.txt 2010-09-15 03:49:13 UTC (rev
40570)
@@ -217,5 +217,5 @@
install(FILES ${doc_MANS} DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man5)
-CONFIGURE_FILE(pad_file.xml.in ${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml)
+CONFIGURE_FILE(pad_file.xml.in ${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/doc)
Modified: brlcad/branches/cmake/misc/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/misc/CMakeLists.txt 2010-09-14 22:46:36 UTC (rev
40569)
+++ brlcad/branches/cmake/misc/CMakeLists.txt 2010-09-15 03:49:13 UTC (rev
40570)
@@ -8,7 +8,7 @@
ADD_SUBDIRECTORY(pkgconfig)
ADD_SUBDIRECTORY(enigma)
-CONFIGURE_FILE(brlcad-config.in ${CMAKE_CURRENT_BINARY_DIR}/brlcad-config)
+CONFIGURE_FILE(brlcad-config.in ${CMAKE_CURRENT_BINARY_DIR}/brlcad-config
@ONLY)
INSTALL(FILES fortran_example.f DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/sample_applications)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/brlcad-config DESTINATION
${BRLCAD_INSTALL_BIN_DIR})
Modified: brlcad/branches/cmake/misc/pkgconfig/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/misc/pkgconfig/CMakeLists.txt 2010-09-14 22:46:36 UTC
(rev 40569)
+++ brlcad/branches/cmake/misc/pkgconfig/CMakeLists.txt 2010-09-15 03:49:13 UTC
(rev 40570)
@@ -19,6 +19,6 @@
FOREACH(pkgfile ${pkgconfig_DATA})
STRING(REGEX REPLACE "([0-9a-z_-]*).pc.in" "\\1" filename_root "${pkgfile}")
- configure_file(${pkgfile} ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.pc)
+ configure_file(${pkgfile} ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.pc
@ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.pc DESTINATION
${BRLCAD_INSTALL_LIB_DIR}/pkgconfig)
ENDFOREACH(pkgfile ${pkgconfig_DATA})
Modified: brlcad/branches/cmake/src/brlman/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/brlman/CMakeLists.txt 2010-09-14 22:46:36 UTC
(rev 40569)
+++ brlcad/branches/cmake/src/brlman/CMakeLists.txt 2010-09-15 03:49:13 UTC
(rev 40570)
@@ -1,17 +1,8 @@
SET(BRLCAD_ROOT ${BRLCAD_PREFIX})
SET(BRLCAD_DATA ${BRLCAD_INSTALL_DATA_DIR})
-SET(prefix ${BRLCAD_PREFIX})
SET(datarootdir ${BRLCAD_INSTALL_DATA_DIR})
SET(mandir "${BRLCAD_INSTALL_MAN_DIR}")
-SET(PAGER "\${PAGER}")
-SET(MANPAGER "\${MANPAGER}")
-SET(MANPATH "\${MANPATH}")
-SET(path_to_this "\${path_to_this}")
-SET(path_elements "\${path_elements}")
-SET(dir "\${dir}")
-SET(pattern "\${pattern}")
-SET(try "\${try}")
-configure_file(brlman.sh.in ${CMAKE_BINARY_DIR}/src/brlman/brlman)
+configure_file(brlman.sh.in ${CMAKE_BINARY_DIR}/src/brlman/brlman @ONLY)
INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/src/brlman/brlman DESTINATION
${BRLCAD_INSTALL_BIN_DIR})
install(FILES brlman.1 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man1)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
