Revision: 42270
http://brlcad.svn.sourceforge.net/brlcad/?rev=42270&view=rev
Author: starseeker
Date: 2011-01-14 19:47:40 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
Few more fixes to CMake logic.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/doc/docbook/CMakeLists.txt
brlcad/branches/cmake/include/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2011-01-14 19:26:24 UTC (rev
42269)
+++ brlcad/branches/cmake/CMakeLists.txt 2011-01-14 19:47:40 UTC (rev
42270)
@@ -369,15 +369,7 @@
INSTALL_DIR(PACKAGE lib)
# The location in which to install BRL-CAD data files
-IF(NOT ${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR)
- IF (${CMAKE_INSTALL_PREFIX} MATCHES "^/usr[/]*$")
- INSTALL_DIR(DATA "share/brlcad/${BRLCAD_VERSION}")
- ENDIF()
- IF (${CMAKE_INSTALL_PREFIX} MATCHES "^/usr/local[/]*$")
- INSTALL_DIR(DATA "share/brlcad/${BRLCAD_VERSION}")
- ENDIF()
- INSTALL_DIR(DATA "share/${BRLCAD_VERSION}")
-ENDIF(NOT ${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR)
+INSTALL_DIR(DATA "share/brlcad/${BRLCAD_VERSION}")
# The location in which to install BRL-CAD Manual pages
INSTALL_DIR(MAN ${DATA_DIR}/man)
Modified: brlcad/branches/cmake/doc/docbook/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/doc/docbook/CMakeLists.txt 2011-01-14 19:26:24 UTC
(rev 42269)
+++ brlcad/branches/cmake/doc/docbook/CMakeLists.txt 2011-01-14 19:47:40 UTC
(rev 42270)
@@ -20,7 +20,7 @@
COMMAND XML_CATALOG_FILES=${XML_CATALOG_FILES}
${XSLTPROC_EXEC} ${XSLTPROC_FLAGS} -o ${outfile} ${XSL_XHTML_STYLESHEET}
${CMAKE_CURRENT_SOURCE_DIR}/${filename}
)
ADD_CUSTOM_TARGET(${targetname} ALL DEPENDS ${outfile})
- INSTALL(FILES ${outfile} DESTINATION
${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
+ INSTALL(FILES ${outfile} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${xml_files}})
ENDMACRO(DOCBOOK_TO_HTML targetname_suffix srcfile outfile targetdir)
@@ -55,7 +55,7 @@
DEPENDS ${tmp_fo_file}
)
ADD_CUSTOM_TARGET(${targetname} ALL DEPENDS ${outfile})
- INSTALL(FILES ${outfile} DESTINATION
${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
+ INSTALL(FILES ${outfile} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${xml_files}})
ENDMACRO(DOCBOOK_TO_PDF targetname_suffix srcfile outfile targetdir)
Modified: brlcad/branches/cmake/include/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/include/CMakeLists.txt 2011-01-14 19:26:24 UTC
(rev 42269)
+++ brlcad/branches/cmake/include/CMakeLists.txt 2011-01-14 19:47:40 UTC
(rev 42270)
@@ -82,7 +82,7 @@
FILE(COPY ${brlcadinclude_required} DESTINATION
${CMAKE_BINARY_DIR}/include/brlcad)
INSTALL(FILES ${brlcadinclude_required} DESTINATION include/brlcad)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/brlcad_config.h DESTINATION
include/brlcad)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/include/brlcad/brlcad_config.h DESTINATION
include/brlcad)
IF(NOT BRLCAD-BUILD_BENCHMARK_ONLY AND NOT BRLCAD-BUILD_RTSERVER_ONLY)
FILE(COPY ${brlcadinclude_wanted} DESTINATION
${CMAKE_BINARY_DIR}/include/brlcad)
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
