Revision: 44753
http://brlcad.svn.sourceforge.net/brlcad/?rev=44753&view=rev
Author: starseeker
Date: 2011-06-06 20:48:22 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Needs more testing, but simplify down the install dir variables.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/bench/CMakeLists.txt
brlcad/trunk/db/CMakeLists.txt
brlcad/trunk/doc/CMakeLists.txt
brlcad/trunk/doc/docbook/CMakeLists.txt
brlcad/trunk/doc/legal/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
brlcad/trunk/misc/CMake/ThirdParty.cmake
brlcad/trunk/misc/CMakeLists.txt
brlcad/trunk/misc/enigma/CMakeLists.txt
brlcad/trunk/misc/pkgconfig/CMakeLists.txt
brlcad/trunk/pix/CMakeLists.txt
brlcad/trunk/sh/CMakeLists.txt
brlcad/trunk/src/adrt/CMakeLists.txt
brlcad/trunk/src/brlman/CMakeLists.txt
brlcad/trunk/src/bwish/CMakeLists.txt
brlcad/trunk/src/liboptical/CMakeLists.txt
brlcad/trunk/src/other/jove/CMakeLists.txt
brlcad/trunk/src/other/libtermlib/CMakeLists.txt
brlcad/trunk/src/other/step/data/CMakeLists.txt
brlcad/trunk/src/other/step/doc/CMakeLists.txt
brlcad/trunk/src/other/tcl/doc/CMakeLists.txt
brlcad/trunk/src/other/tk/doc/CMakeLists.txt
brlcad/trunk/src/rttherm/CMakeLists.txt
brlcad/trunk/src/tclscripts/CMakeLists.txt
brlcad/trunk/src/tclscripts/hv3/CMakeLists.txt
brlcad/trunk/src/tclscripts/rtwizard/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev 44752)
+++ brlcad/trunk/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev 44753)
@@ -437,43 +437,53 @@
ENDFOREACH()
#---------------------------------------------------------------------
-# Configure install locations. It may be that this should be made
-# into its own .cmake file and included in each library, to allow
-# for more flexibility in using individual libraries in other projects.
-MACRO(INSTALL_DIR upper suffix)
- IF(NOT ${CMAKE_PROJECT_NAME}_INSTALL_${upper}_DIR)
- SET(${CMAKE_PROJECT_NAME}_INSTALL_${upper}_DIR ${suffix})
- SET(${upper}_DIR ${suffix})
- ENDIF(NOT ${CMAKE_PROJECT_NAME}_INSTALL_${upper}_DIR)
-ENDMACRO(INSTALL_DIR upper suffix)
+# Configure install locations. Don't set these if they have already
+# been set by some other means (like a higher level CMakeLists.txt file
+# including this one.)
# The location in which to install BRLCAD executables.
-INSTALL_DIR(BIN bin)
+IF(NOT BIN_DIR)
+ SET(BIN_DIR bin)
+ENDIF(NOT BIN_DIR)
# The location in which to install BRLCAD header files.
-INSTALL_DIR(INCLUDE include)
+IF(NOT INCLUDE_DIR)
+ SET(INCLUDE_DIR include)
+ENDIF(NOT INCLUDE_DIR)
# The location in which to install BRL-CAD libraries.
-IF(NOT WIN32)
- INSTALL_DIR(LIB lib)
-ELSE(NOT WIN32)
- INSTALL_DIR(LIB bin)
-ENDIF(NOT WIN32)
+IF(NOT LIB_DIR)
+ IF(NOT WIN32)
+ SET(LIB_DIR lib)
+ ELSE(NOT WIN32)
+ SET(LIB_DIR bin)
+ ENDIF(NOT WIN32)
+ENDIF(NOT LIB_DIR)
# The location in which to install BRL-CAD configuration files.
-INSTALL_DIR(CONF etc)
+IF(NOT CONF_DIR)
+ SET(CONF_DIR etc)
+ENDIF(NOT CONF_DIR)
# The location in which to install CMake scripts for packaging BRLCAD.
-INSTALL_DIR(PACKAGE lib)
+IF(NOT PACKAGE_DIR)
+ SET(PACKAGE_DIR lib)
+ENDIF(NOT PACKAGE_DIR)
# The location in which to install BRL-CAD data files
-INSTALL_DIR(DATA "share/brlcad/${BRLCAD_VERSION}")
+IF(NOT DATA_DIR)
+ SET(DATA_DIR "share/brlcad/${BRLCAD_VERSION}")
+ENDIF(NOT DATA_DIR)
# The location in which to install BRL-CAD Manual pages
-INSTALL_DIR(MAN ${DATA_DIR}/man)
+IF(NOT MAN_DIR)
+ SET(MAN_DIR man)
+ENDIF(NOT MAN_DIR)
# The location in which to install BRL-CAD documentation files
-INSTALL_DIR(DOC ${DATA_DIR}/doc)
+IF(NOT DOC_DIR)
+ SET(DOC_DIR ${DATA_DIR}/doc)
+ENDIF(NOT DOC_DIR)
#---------------------------------------------------------------------
# We will need a brlcad_config.h.in file to hold all the #cmakedefine
@@ -500,7 +510,7 @@
FILE(APPEND ${CONFIG_H_FILE} "#define PACKAGE_NAME \"BRL-CAD\"\n")
FILE(APPEND ${CONFIG_H_FILE} "#define PACKAGE_STRING \"BRL-CAD
${BRLCAD_VERSION}\"\n")
FILE(APPEND ${CONFIG_H_FILE} "#define PACKAGE_TARNAME \"brlcad\"\n")
-FILE(APPEND ${CONFIG_H_FILE} "#define BRLCAD_DATA
\"${CMAKE_INSTALL_PREFIX}/${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}\"\n")
+FILE(APPEND ${CONFIG_H_FILE} "#define BRLCAD_DATA
\"${CMAKE_INSTALL_PREFIX}/${DATA_DIR}\"\n")
FILE(APPEND ${CONFIG_H_FILE} "#define BRLCAD_ROOT
\"${CMAKE_INSTALL_PREFIX}\"\n")
FILE(APPEND ${CONFIG_H_FILE} "#define PACKAGE_VERSION \"${BRLCAD_VERSION}\"\n")
FILE(APPEND ${CONFIG_H_FILE} "#define VERSION \"${BRLCAD_VERSION}\"\n")
@@ -1137,11 +1147,11 @@
# Directory settings
SET(CMAKE_INSTALL_PREFIX_LABEL "Prefix")
- SET(${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR_LABEL "Binaries")
- SET(${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR_LABEL "Manual pages")
- SET(${CMAKE_PROJECT_NAME}_INSTALL_CONF_DIR_LABEL "Configration files")
- SET(${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR_LABEL "Data resource files")
- SET(PATHLABELS CMAKE_INSTALL_PREFIX
${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR ${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR
${CMAKE_PROJECT_NAME}_INSTALL_CONF_DIR ${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR)
+ SET(BIN_DIR_LABEL "Binaries")
+ SET(MAN_DIR_LABEL "Manual pages")
+ SET(CONF_DIR_LABEL "Configration files")
+ SET(DATA_DIR_LABEL "Data resource files")
+ SET(PATHLABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR)
SET(PATHLABELLENGTH 0)
FOREACH(path_label ${PATHLABELS})
STRING(LENGTH ${${path_label}_LABEL} CURRENTLENGTH)
@@ -1440,7 +1450,7 @@
README
)
FILE(COPY ${toplevel_DOCFILES} DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR})
-INSTALL(FILES ${toplevel_DOCFILES} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR})
+INSTALL(FILES ${toplevel_DOCFILES} DESTINATION ${DATA_DIR})
# CPack is used to produce tgz files, RPMS, etc. If SUBBUILD is enabled this
Modified: brlcad/trunk/bench/CMakeLists.txt
===================================================================
--- brlcad/trunk/bench/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev 44752)
+++ brlcad/trunk/bench/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev 44753)
@@ -19,7 +19,7 @@
BRLCAD_ADDEXEC(pixcmp pixcmp.c libbu)
configure_file(run.sh ${CMAKE_BINARY_DIR}/bin/benchmark COPYONLY)
-INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/benchmark DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/benchmark DESTINATION ${BIN_DIR})
FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/benchmsg.cmake "MESSAGE(\"---\")\n")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeTmp/benchmsg.cmake "MESSAGE(\"Run 'make
benchmark-clean' in the bench directory to delete the logic\")\n")
Modified: brlcad/trunk/db/CMakeLists.txt
===================================================================
--- brlcad/trunk/db/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev 44752)
+++ brlcad/trunk/db/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev 44753)
@@ -46,7 +46,7 @@
)
ADD_CUSTOM_TARGET(${g_model_root}.g ALL DEPENDS
${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g)
IF(BRLCAD-INSTALL_EXAMPLE_GEOMETRY)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g
DESTINATION ${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/db)
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g
DESTINATION ${DATA_DIR}/db)
ENDIF(BRLCAD-INSTALL_EXAMPLE_GEOMETRY)
SET(BUILT_MODELS
"${BUILT_MODELS};${CMAKE_BINARY_DIR}/${DATA_DIR}/db/${g_model_root}.g")
ENDFOREACH(g_model ${G_SAMPLE_MODELS})
Modified: brlcad/trunk/doc/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev 44752)
+++ brlcad/trunk/doc/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev 44753)
@@ -217,6 +217,6 @@
ADD_MAN_PAGES(5 doc_MANS)
CONFIGURE_FILE(pad_file.xml.in ${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/doc)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pad_file.xml DESTINATION
${DATA_DIR}/doc)
CMAKEFILES(pad_file.xml.in STARTERS)
Modified: brlcad/trunk/doc/docbook/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/docbook/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/doc/docbook/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -21,7 +21,7 @@
DEPENDS ${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 ${DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${xml_files}})
CMAKEFILES(${${xml_files}})
ENDMACRO(DOCBOOK_TO_HTML targetname_suffix srcfile outfile targetdir)
@@ -37,7 +37,7 @@
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${filename}
)
ADD_CUSTOM_TARGET(${targetname} ALL DEPENDS ${outfile})
- INSTALL(FILES ${outfile} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man${mannum})
+ INSTALL(FILES ${outfile} DESTINATION ${MAN_DIR}/man${mannum})
ENDFOREACH(filename ${${xml_files}})
CMAKEFILES(${${xml_files}})
ENDMACRO(DOCBOOK_TO_MAN targetname_suffix srcfile outfile targetdir)
@@ -60,7 +60,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 ${DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${xml_files}})
ENDMACRO(DOCBOOK_TO_PDF targetname_suffix srcfile outfile targetdir)
Modified: brlcad/trunk/doc/legal/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/legal/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/doc/legal/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -4,4 +4,4 @@
lgpl.txt
)
-install(FILES ${doc_legal} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/doc/legal)
+install(FILES ${doc_legal} DESTINATION ${DATA_DIR}/doc/legal)
Modified: brlcad/trunk/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/misc/CMake/BRLCAD_Util.cmake 2011-06-06 20:48:22 UTC (rev
44753)
@@ -53,7 +53,7 @@
STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
add_executable(${execname} ${srcslist})
target_link_libraries(${execname} ${libslist})
- INSTALL(TARGETS ${execname} DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+ INSTALL(TARGETS ${execname} DESTINATION ${BIN_DIR})
FOREACH(extraarg ${ARGN})
IF(${extraarg} MATCHES "NOSTRICT" AND BRLCAD-ENABLE_STRICT)
IF(NOERROR_FLAG)
@@ -76,7 +76,7 @@
if(NOT ${libs} MATCHES "NONE")
target_link_libraries(${libname} ${libslist})
endif(NOT ${libs} MATCHES "NONE")
- INSTALL(TARGETS ${libname} DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+ INSTALL(TARGETS ${libname} DESTINATION ${LIB_DIR})
FOREACH(extraarg ${ARGN})
IF(${extraarg} MATCHES "NOSTRICT" AND BRLCAD-ENABLE_STRICT)
IF(NOERROR_FLAG)
@@ -99,7 +99,7 @@
#
http://www.cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
SET_TARGET_PROPERTIES(${libname}-static PROPERTIES PREFIX
"lib")
ENDIF(WIN32)
- INSTALL(TARGETS ${libname}-static DESTINATION
${BRLCAD_INSTALL_LIB_DIR})
+ INSTALL(TARGETS ${libname}-static DESTINATION ${LIB_DIR})
FOREACH(extraarg ${ARGN})
IF(${extraarg} MATCHES "NOSTRICT" AND BRLCAD-ENABLE_STRICT)
IF(NOERROR_FLAG)
@@ -162,7 +162,7 @@
ADD_CUSTOM_TARGET(${datalist}_cp ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${targetprefix}.sentinel)
ENDIF(NOT WIN32)
FOREACH(filename ${${datalist}})
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${filename}
DESTINATION ${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${filename}
DESTINATION ${DATA_DIR}/${targetdir})
ENDFOREACH(filename ${${datalist}})
CMAKEFILES(${${datalist}})
ENDMACRO(BRLCAD_ADDDATA datalist targetdir)
@@ -179,7 +179,7 @@
)
ADD_CUSTOM_TARGET(${targetprefix}_${filestring}_cp ALL DEPENDS
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/${filename})
ENDIF(BRLCAD-ENABLE_DATA_TARGETS)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${filename} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${filename} DESTINATION
${DATA_DIR}/${targetdir})
GET_FILENAME_COMPONENT(ITEM_NAME ${filename} NAME)
FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmakefiles.cmake
"\\${ITEM_NAME}")
ENDMACRO(BRLCAD_ADDFILE datalist targetdir)
Modified: brlcad/trunk/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ThirdParty.cmake 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/misc/CMake/ThirdParty.cmake 2011-06-06 20:48:22 UTC (rev
44753)
@@ -114,7 +114,7 @@
CONFIGURE_COMMAND mkdir -p
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ &&
- <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--mandir=${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR} ${extraopts}
+ <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX} --mandir=${MAN_DIR} ${extraopts}
BUILD_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE)
INSTALL_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE) install
)
@@ -133,7 +133,7 @@
<SOURCE_DIR>/configure <SOURCE_DIR>/configure.in &&
mkdir -p
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ &&
- <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--mandir=${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR} ${extraopts}
+ <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX} --mandir=${MAN_DIR} ${extraopts}
BUILD_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE)
INSTALL_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE) install
)
@@ -152,7 +152,7 @@
CONFIGURE_COMMAND cd <SOURCE_DIR> && autoreconf -i -f
&& mkdir -p
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ &&
- <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--mandir=${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR} ${extraopts}
+ <SOURCE_DIR>/configure
--prefix=${${CMAKE_PROJECT_NAME}_PREFIX}
--exec-prefix=${${CMAKE_PROJECT_NAME}_PREFIX} --mandir=${MAN_DIR} ${extraopts}
BUILD_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE)
INSTALL_COMMAND cd
${${CMAKE_PROJECT_NAME}_BINARY_DIR}/${projpath}/ && $(MAKE) install
)
Modified: brlcad/trunk/misc/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev 44752)
+++ brlcad/trunk/misc/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev 44753)
@@ -16,9 +16,9 @@
CONFIGURE_FILE(brlcad-config.in ${CMAKE_BINARY_DIR}/bin/brlcad-config @ONLY)
BRLCAD_ADDFILE(fortran_example.f sample_applications)
-INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/brlcad-config DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/brlcad-config DESTINATION ${BIN_DIR})
FILE(COPY brlcad-config.1 DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/man1)
-INSTALL(FILES brlcad-config.1 DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
+INSTALL(FILES brlcad-config.1 DESTINATION ${MAN_DIR}/man1)
SET(density_DATAFILES
GQA_SAMPLE_DENSITIES
Modified: brlcad/trunk/misc/enigma/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/enigma/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/misc/enigma/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -16,7 +16,7 @@
add_executable(enigma enigma.c crypt.c)
target_link_libraries(enigma ${BSD_LIBRARY})
ENDIF(CRYPT_LIBRARY)
-install(TARGETS enigma DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
+install(TARGETS enigma DESTINATION ${BIN_DIR})
set_target_properties(enigma PROPERTIES COMPILE_FLAGS "-w")
ADD_MAN_PAGE(1 enigma.1)
Modified: brlcad/trunk/misc/pkgconfig/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/pkgconfig/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/misc/pkgconfig/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -43,5 +43,5 @@
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
@ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.pc DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_LIB_DIR}/pkgconfig)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${filename_root}.pc DESTINATION
${LIB_DIR}/pkgconfig)
ENDFOREACH(pkgfile ${pkgconfig_DATA})
Modified: brlcad/trunk/pix/CMakeLists.txt
===================================================================
--- brlcad/trunk/pix/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev 44752)
+++ brlcad/trunk/pix/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev 44753)
@@ -40,5 +40,5 @@
FILE(COPY ${BENCHMARK_PIX} DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR}/pix)
FILE(COPY ${PIX_LOG} DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR}/pix)
-INSTALL(FILES ${BENCHMARK_PIX} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pix)
-INSTALL(FILES ${PIX_LOG} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/pix)
+INSTALL(FILES ${BENCHMARK_PIX} DESTINATION ${DATA_DIR}/pix)
+INSTALL(FILES ${PIX_LOG} DESTINATION ${DATA_DIR}/pix)
Modified: brlcad/trunk/sh/CMakeLists.txt
===================================================================
--- brlcad/trunk/sh/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev 44752)
+++ brlcad/trunk/sh/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev 44753)
@@ -19,7 +19,7 @@
configure_file(${script} ${CMAKE_BINARY_DIR}/bin/${script} COPYONLY)
ENDFOREACH(script ${sh_SCRIPTS})
-INSTALL(PROGRAMS ${sh_SCRIPTS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+INSTALL(PROGRAMS ${sh_SCRIPTS} DESTINATION ${BIN_DIR})
SET(noinst_SCRIPTS
cmakecheck.sh
Modified: brlcad/trunk/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/adrt/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/src/adrt/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -37,7 +37,7 @@
IF(BUILD_SHARED_LIBS)
add_library(librender SHARED ${LIBRENDER_SRCS})
target_link_libraries(librender libgcv)
- INSTALL(TARGETS librender DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_LIB_DIR})
+ INSTALL(TARGETS librender DESTINATION ${LIB_DIR})
IF(WIN32)
SET_TARGET_PROPERTIES(librender PROPERTIES COMPILE_FLAGS
"-DRENDER_EXPORT_DLL")
ENDIF(WIN32)
@@ -52,7 +52,7 @@
SET_TARGET_PROPERTIES(librender-static PROPERTIES COMPILE_FLAGS
"-DRENDER_EXPORT_DLL")
SET_TARGET_PROPERTIES(librender-static PROPERTIES PREFIX "lib")
ENDIF(WIN32)
- INSTALL(TARGETS librender-static DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_LIB_DIR})
+ INSTALL(TARGETS librender-static DESTINATION ${LIB_DIR})
ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
SET(tie_HDRS
@@ -84,7 +84,7 @@
ELSE(WIN32)
target_link_libraries(issttcltk librender ${TCL_LIBRARIES}
${TOGL_LIBRARIES})
ENDIF(WIN32)
- INSTALL(TARGETS issttcltk DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_LIB_DIR}/isst0.1)
+ INSTALL(TARGETS issttcltk DESTINATION ${LIB_DIR}/isst0.1)
GET_TARGET_PROPERTY(ISSTTCL_LIBLOCATION issttcltk
LOCATION_${CMAKE_BUILD_TYPE})
GET_FILENAME_COMPONENT(ISSTTCL_LIBNAME ${ISSTTCL_LIBLOCATION} NAME)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
isst 0.1 [list load [file join $dir .. .. ${LIB_DIR} isst0.1
${ISSTTCL_LIBNAME}]]")
Modified: brlcad/trunk/src/brlman/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/brlman/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/src/brlman/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -11,11 +11,11 @@
FILE(REMOVE ${CMAKE_BINARY_DIR}/src/brlman/brlman)
SET(BRLCAD_ROOT "${CMAKE_INSTALL_PREFIX}")
-SET(BRLCAD_DATA "${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}")
+SET(BRLCAD_DATA "${DATA_DIR}")
SET(prefix "${CMAKE_INSTALL_PREFIX}")
SET(datarootdir "\${prefix}/share")
SET(mandir "\${datarootdir}/man")
configure_file(brlman.sh.in ${CMAKE_BINARY_DIR}/src/brlman/brlman @ONLY)
-INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/src/brlman/brlman DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
-install(FILES brlman.1 DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/src/brlman/brlman DESTINATION ${BIN_DIR})
+install(FILES brlman.1 DESTINATION ${MAN_DIR}/man1)
Modified: brlcad/trunk/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/bwish/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/src/bwish/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -27,7 +27,7 @@
CMAKEFILES(winMain.c)
ENDIF(WIN32)
SET_TARGET_PROPERTIES(bwish PROPERTIES COMPILE_DEFINITIONS "BWISH=1")
- install(TARGETS bwish RUNTIME DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+ install(TARGETS bwish RUNTIME DESTINATION ${BIN_DIR})
ENDIF(BRLCAD-ENABLE_TK)
CMAKEFILES(unixMain.c)
Modified: brlcad/trunk/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -65,6 +65,6 @@
IF(WIN32)
SET_TARGET_PROPERTIES(librtms-static PROPERTIES PREFIX "lib")
ENDIF(WIN32)
-INSTALL(TARGETS librtms-static DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_LIB_DIR})
+INSTALL(TARGETS librtms-static DESTINATION ${LIB_DIR})
CMAKEFILES(liboptical.dsp)
Modified: brlcad/trunk/src/other/jove/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/jove/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/src/other/jove/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -43,7 +43,7 @@
INSTALL(TARGETS findcom DESTINATION bin)
FILE(COPY jove.1 DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/man1)
-INSTALL(FILES jove.1 DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
+INSTALL(FILES jove.1 DESTINATION ${MAN_DIR}/man1)
SET(jove_DATA
describe.com
@@ -52,5 +52,5 @@
)
FILE(COPY ${jove_DATA} DESTINATION ${CMAKE_BINARY_DIR}/${DATA_DIR}/jove)
-INSTALL(FILES ${jove_DATA} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/jove)
+INSTALL(FILES ${jove_DATA} DESTINATION ${DATA_DIR}/jove)
Modified: brlcad/trunk/src/other/libtermlib/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libtermlib/CMakeLists.txt 2011-06-06 20:23:23 UTC
(rev 44752)
+++ brlcad/trunk/src/other/libtermlib/CMakeLists.txt 2011-06-06 20:48:22 UTC
(rev 44753)
@@ -27,6 +27,6 @@
SET_TARGET_PROPERTIES(termlib-static PROPERTIES OUTPUT_NAME "termlib")
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)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/etc/termcap DESTINATION
${DATA_DIR}/etc)
ENDIF(NOT MSVC)
Modified: brlcad/trunk/src/other/step/data/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/data/CMakeLists.txt 2011-06-06 20:23:23 UTC
(rev 44752)
+++ brlcad/trunk/src/other/step/data/CMakeLists.txt 2011-06-06 20:48:22 UTC
(rev 44753)
@@ -1,5 +1,3 @@
-SET(SCL_DATA ${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR})
-
SET(ap203_data
ap203/203wseds.exp
ap203/cube1.p21
@@ -12,19 +10,19 @@
ap203/rod_aspect1.p21
ap203/star1.p21
)
-INSTALL(FILES ${ap203_data} DESTINATION ${SCL_DATA}/data/ap203)
+INSTALL(FILES ${ap203_data} DESTINATION ${DATA_DIR}/data/ap203)
SET(ap227_data
ap227/ap227.exp
ap227/mitre.p21
ap227/mitre.step.txt
)
-INSTALL(FILES ${ap227_data} DESTINATION ${SCL_DATA}/data/ap227)
+INSTALL(FILES ${ap227_data} DESTINATION ${DATA_DIR}/data/ap227)
SET(step_example_data
example/example.exp
)
-INSTALL(FILES ${step_example_data} DESTINATION ${SCL_DATA}/data/example)
+INSTALL(FILES ${step_example_data} DESTINATION ${DATA_DIR}/data/example)
@@ -32,4 +30,4 @@
pdmnet.exp
select.exp
)
-INSTALL(FILES ${step_datafiles} DESTINATION ${SCL_DATA}/data)
+INSTALL(FILES ${step_datafiles} DESTINATION ${DATA_DIR}/data)
Modified: brlcad/trunk/src/other/step/doc/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/doc/CMakeLists.txt 2011-06-06 20:23:23 UTC
(rev 44752)
+++ brlcad/trunk/src/other/step/doc/CMakeLists.txt 2011-06-06 20:48:22 UTC
(rev 44753)
@@ -4,4 +4,4 @@
man/man1/fedex_plus.1
man/man1/mkProbe.1
)
-INSTALL(FILES ${scl_MANS} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
+INSTALL(FILES ${scl_MANS} DESTINATION ${MAN_DIR}/man1)
Modified: brlcad/trunk/src/other/tcl/doc/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tcl/doc/CMakeLists.txt 2011-06-06 20:23:23 UTC
(rev 44752)
+++ brlcad/trunk/src/other/tcl/doc/CMakeLists.txt 2011-06-06 20:48:22 UTC
(rev 44753)
@@ -255,13 +255,13 @@
IF(TCLMAN_GENERATED)
FILE(GLOB TCL_MAN1 "${CMAKE_CURRENT_BINARY_DIR}/man1/*")
FILE(COPY ${TCL_MAN1} DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/man1)
- INSTALL(FILES ${TCL_MAN1} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
+ INSTALL(FILES ${TCL_MAN1} DESTINATION ${MAN_DIR}/man1)
FILE(GLOB TCL_MAN3 "${CMAKE_CURRENT_BINARY_DIR}/man3/*")
FILE(COPY ${TCL_MAN3} DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/man3)
- INSTALL(FILES ${TCL_MAN3} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man3)
+ INSTALL(FILES ${TCL_MAN3} DESTINATION ${MAN_DIR}/man3)
FILE(GLOB TCL_MANN "${CMAKE_CURRENT_BINARY_DIR}/mann/*")
FILE(COPY ${TCL_MANN} DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/mann)
- INSTALL(FILES ${TCL_MANN} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/mann)
+ INSTALL(FILES ${TCL_MANN} DESTINATION ${MAN_DIR}/mann)
ENDIF(TCLMAN_GENERATED)
Modified: brlcad/trunk/src/other/tk/doc/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tk/doc/CMakeLists.txt 2011-06-06 20:23:23 UTC
(rev 44752)
+++ brlcad/trunk/src/other/tk/doc/CMakeLists.txt 2011-06-06 20:48:22 UTC
(rev 44753)
@@ -222,13 +222,13 @@
IF(TKMAN_GENERATED)
FILE(GLOB TK_MAN1 "${CMAKE_CURRENT_BINARY_DIR}/man1/*")
FILE(COPY ${TK_MAN1} DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/man1)
- INSTALL(FILES ${TK_MAN1} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man1)
+ INSTALL(FILES ${TK_MAN1} DESTINATION ${MAN_DIR}/man1)
FILE(GLOB TK_MAN3 "${CMAKE_CURRENT_BINARY_DIR}/man3/*")
FILE(COPY ${TK_MAN3} DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/man3)
- INSTALL(FILES ${TK_MAN3} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/man3)
+ INSTALL(FILES ${TK_MAN3} DESTINATION ${MAN_DIR}/man3)
FILE(GLOB TK_MANN "${CMAKE_CURRENT_BINARY_DIR}/mann/*")
FILE(COPY ${TK_MANN} DESTINATION ${CMAKE_BINARY_DIR}/${MAN_DIR}/mann)
- INSTALL(FILES ${TK_MANN} DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/mann)
+ INSTALL(FILES ${TK_MANN} DESTINATION ${MAN_DIR}/mann)
ENDIF(TKMAN_GENERATED)
Modified: brlcad/trunk/src/rttherm/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rttherm/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/src/rttherm/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -13,7 +13,7 @@
BRLCAD_ADDEXEC(rttherm "spectrum.c viewtherm.c" "libged libfb librttherm
libmultispectral liboptical")
SET_TARGET_PROPERTIES(rttherm PROPERTIES COMPILE_DEFINITIONS
"RT_MULTISPECTRAL")
-INSTALL(PROGRAMS ssampview.tcl DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+INSTALL(PROGRAMS ssampview.tcl DESTINATION ${BIN_DIR})
BRLCAD_ADDEXEC(ssamp-bw ssamp-bw.c "liboptical")
Modified: brlcad/trunk/src/tclscripts/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/CMakeLists.txt 2011-06-06 20:23:23 UTC (rev
44752)
+++ brlcad/trunk/src/tclscripts/CMakeLists.txt 2011-06-06 20:48:22 UTC (rev
44753)
@@ -8,7 +8,7 @@
DEPENDS btclsh ${targetprefix}.sentinel
)
ADD_CUSTOM_TARGET(${name}_pkgIndex.tcl ALL DEPENDS
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/pkgIndex.tcl)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/pkgIndex.tcl
DESTINATION ${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/pkgIndex.tcl
DESTINATION ${DATA_DIR}/${targetdir})
ENDMACRO(pkgIndex_BUILD name targetdir)
MACRO(tclIndex_BUILD name targetdir)
@@ -19,7 +19,7 @@
DEPENDS btclsh ${targetprefix}.sentinel
)
ADD_CUSTOM_TARGET(${name}_tclIndex ALL DEPENDS
${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/tclIndex)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/tclIndex
DESTINATION ${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/${targetdir})
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/${DATA_DIR}/${targetdir}/tclIndex
DESTINATION ${DATA_DIR}/${targetdir})
ENDMACRO(tclIndex_BUILD name targetdir)
Modified: brlcad/trunk/src/tclscripts/hv3/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/hv3/CMakeLists.txt 2011-06-06 20:23:23 UTC
(rev 44752)
+++ brlcad/trunk/src/tclscripts/hv3/CMakeLists.txt 2011-06-06 20:48:22 UTC
(rev 44753)
@@ -10,8 +10,8 @@
BRLCAD_ADDDATA(hv3_TCLSCRIPTS tclscripts/hv3)
pkgIndex_BUILD(hv3 tclscripts/hv3)
tclIndex_BUILD(hv3 tclscripts/hv3)
-install(FILES hv3.man DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/doc)
-install(FILES tkhtml.n DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_MAN_DIR}/mann)
+install(FILES hv3.man DESTINATION ${DATA_DIR}/doc)
+install(FILES tkhtml.n DESTINATION ${MAN_DIR}/mann)
SET(hv3_ignore_files
demo
hv3.man
Modified: brlcad/trunk/src/tclscripts/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/rtwizard/CMakeLists.txt 2011-06-06 20:23:23 UTC
(rev 44752)
+++ brlcad/trunk/src/tclscripts/rtwizard/CMakeLists.txt 2011-06-06 20:48:22 UTC
(rev 44753)
@@ -5,7 +5,7 @@
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/rtwizard.tcl ${CMAKE_BINARY_DIR}/bin/rtwizard
)
ADD_CUSTOM_TARGET(rtwizard ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/rtwizard)
-INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/rtwizard DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_BIN_DIR})
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/bin/rtwizard DESTINATION ${BIN_DIR})
SET(rtwizard_TCLSCRIPTS
RaytraceWizard.tcl
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today.
http://p.sf.net/sfu/quest-dev2dev2
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
