Revision: 42329
          http://brlcad.svn.sourceforge.net/brlcad/?rev=42329&view=rev
Author:   starseeker
Date:     2011-01-16 20:56:19 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
Put the termcap stuff where it belongs.

Modified Paths:
--------------
    brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt

Modified: brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt   2011-01-16 
20:49:19 UTC (rev 42328)
+++ brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt   2011-01-16 
20:56:19 UTC (rev 42329)
@@ -1,8 +1,5 @@
 IF(NOT MSVC)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/termcap.src
-    ${CMAKE_CURRENT_BINARY_DIR}/termcap COPYONLY)
 
-
 SET(LIBTERMLIB_PRIVATE_HDRS
        termcap.h
 )
@@ -19,7 +16,7 @@
        -DCM_GT 
        -DCM_B 
        -DCM_D 
-       -DB_TERMCAP=\"${CMAKE_INSTALL_PREFIX}/etc/termcap\"
+       -DB_TERMCAP=\"${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/etc/termcap\"
 )
 
 add_library(termlib SHARED ${LIBTERM_SOURCES})
@@ -29,7 +26,7 @@
 INSTALL(TARGETS termlib-static ARCHIVE DESTINATION lib)
 SET_TARGET_PROPERTIES(termlib-static PROPERTIES OUTPUT_NAME "termlib")
 
-FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}/termcap DESTINATION 
${CMAKE_BINARY_DIR}/${DATA_DIR}/etc)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/termcap DESTINATION 
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/etc)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/termcap.src 
${CMAKE_BINARY_DIR}/${DATA_DIR}/etc/termcap COPYONLY)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/etc/termcap DESTINATION 
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/etc)
 
 ENDIF(NOT MSVC)


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

Reply via email to