Revision: 42137
http://brlcad.svn.sourceforge.net/brlcad/?rev=42137&view=rev
Author: starseeker
Date: 2011-01-12 13:51:59 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Ah, was shooting myself in the foot. We only GENERATE the man pages once, but
we add them to the INSTALL list every time cmake is run.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tcl/doc/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/doc/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/doc/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/doc/CMakeLists.txt 2011-01-12
13:36:26 UTC (rev 42136)
+++ brlcad/branches/cmake/src/other/tcl/doc/CMakeLists.txt 2011-01-12
13:51:59 UTC (rev 42137)
@@ -5,16 +5,13 @@
FIND_PROGRAM(SH_EXEC NAMES sh dash bash DOC "path to shell executable")
FIND_PROGRAM(SED_EXEC NAMES sed DOC "path to sed executable")
-# STILL not working for make package - examine why it's not
-# incorporating the output
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man1)
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3)
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mann)
IF(SED_EXEC AND SH_EXEC AND NOT TCLMAN_GENERATED)
MESSAGE("Generating Tcl man pages...")
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man1)
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3)
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mann)
-
SET(tcl_MAN1
tclsh.1
)
@@ -23,9 +20,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/${manfile}
${CMAKE_CURRENT_BINARY_DIR}/man1 OUTPUT_VARIABLE
MAN1_SH)
ENDFOREACH(manfile ${tcl_MAN1})
- FILE(GLOB TCL_MAN1 "${CMAKE_CURRENT_BINARY_DIR}/man1/*")
- INSTALL(FILES ${TCL_MAN1} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
-
+
SET(tcl_MAN3
Access.3
AddErrInfo.3
@@ -133,8 +128,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/${manfile}
${CMAKE_CURRENT_BINARY_DIR}/man3 OUTPUT_VARIABLE
MAN3_SH)
ENDFOREACH(manfile ${tcl_MAN3})
- FILE(GLOB TCL_MAN3 "${CMAKE_CURRENT_BINARY_DIR}/man3/*")
- INSTALL(FILES ${TCL_MAN3} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man3)
SET(tcl_MANN
Tcl.n
@@ -251,9 +244,18 @@
${CMAKE_CURRENT_SOURCE_DIR}/${manfile}
${CMAKE_CURRENT_BINARY_DIR}/mann OUTPUT_VARIABLE
MAN5_SH)
ENDFOREACH(manfile ${tcl_MANN})
- FILE(GLOB TCL_MANN "${CMAKE_CURRENT_BINARY_DIR}/mann/*")
- INSTALL(FILES ${TCL_MANN} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/mann)
-
+
SET(TCLMAN_GENERATED 1 CACHE BOOL "Flag signifying Tcl man pages are
generated" FORCE)
ENDIF(SED_EXEC AND SH_EXEC AND NOT TCLMAN_GENERATED)
+
+IF(TCLMAN_GENERATED)
+ FILE(GLOB TCL_MAN1 "${CMAKE_CURRENT_BINARY_DIR}/man1/*")
+ INSTALL(FILES ${TCL_MAN1} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
+
+ FILE(GLOB TCL_MAN3 "${CMAKE_CURRENT_BINARY_DIR}/man3/*")
+ INSTALL(FILES ${TCL_MAN3} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man3)
+
+ FILE(GLOB TCL_MANN "${CMAKE_CURRENT_BINARY_DIR}/mann/*")
+ INSTALL(FILES ${TCL_MANN} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/mann)
+ENDIF(TCLMAN_GENERATED)
Modified: brlcad/branches/cmake/src/other/tk/doc/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/doc/CMakeLists.txt 2011-01-12
13:36:26 UTC (rev 42136)
+++ brlcad/branches/cmake/src/other/tk/doc/CMakeLists.txt 2011-01-12
13:51:59 UTC (rev 42137)
@@ -5,13 +5,13 @@
FIND_PROGRAM(SH_EXEC NAMES sh dash bash DOC "path to shell executable")
FIND_PROGRAM(SED_EXEC NAMES sed DOC "path to sed executable")
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man1)
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3)
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mann)
+
IF(SED_EXEC AND SH_EXEC AND NOT TKMAN_GENERATED)
MESSAGE("Generating Tk man pages...")
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man1)
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3)
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mann)
-
SET(tk_MAN1
wish.1
)
@@ -22,10 +22,6 @@
${CMAKE_CURRENT_BINARY_DIR}/man1
OUTPUT_VARIABLE MAN1_SH)
ENDFOREACH(manfile ${tk_MAN1})
- FILE(GLOB TK_MAN1
- "${CMAKE_CURRENT_BINARY_DIR}/man1/*")
- INSTALL(FILES ${TK_MAN1} DESTINATION
- ${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
SET(tk_MAN3
3DBorder.3
@@ -123,12 +119,7 @@
${CMAKE_CURRENT_BINARY_DIR}/man3
OUTPUT_VARIABLE MAN3_SH)
ENDFOREACH(manfile ${tk_MAN3})
- FILE(GLOB TK_MAN3
- "${CMAKE_CURRENT_BINARY_DIR}/man3/*")
- INSTALL(FILES ${TK_MAN3} DESTINATION
- ${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man3)
-
SET(tk_MANN
bell.n
bind.n
@@ -221,11 +212,17 @@
${CMAKE_CURRENT_BINARY_DIR}/mann
OUTPUT_VARIABLE MANN_SH)
ENDFOREACH(manfile ${tk_MANN})
- FILE(GLOB TK_MANN
- "${CMAKE_CURRENT_BINARY_DIR}/mann/*")
- INSTALL(FILES ${TK_MANN} DESTINATION
- ${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/mann)
-
SET(TKMAN_GENERATED 1 CACHE BOOL "Flag signifying Tk man pages are
generated" FORCE)
ENDIF(SED_EXEC AND SH_EXEC AND NOT TKMAN_GENERATED)
+
+IF(TKMAN_GENERATED)
+ FILE(GLOB TK_MAN1 "${CMAKE_CURRENT_BINARY_DIR}/man1/*")
+ INSTALL(FILES ${TK_MAN1} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
+
+ FILE(GLOB TK_MAN3 "${CMAKE_CURRENT_BINARY_DIR}/man3/*")
+ INSTALL(FILES ${TK_MAN3} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man3)
+
+ FILE(GLOB TK_MANN "${CMAKE_CURRENT_BINARY_DIR}/mann/*")
+ INSTALL(FILES ${TK_MANN} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/mann)
+ENDIF(TKMAN_GENERATED)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
