Revision: 42139
http://brlcad.svn.sourceforge.net/brlcad/?rev=42139&view=rev
Author: starseeker
Date: 2011-01-12 14:55:45 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Strip out more absolute paths for installs. The src/other/step directory isn't
with the program yet, but that needs major cleanup anyway so leave it for now.
Probably shouldn't be hardcoding bin and lib in as DESTINATIONS, may want to do
a sweep for that too.
Modified Paths:
--------------
brlcad/branches/cmake/src/archer/CMakeLists.txt
brlcad/branches/cmake/src/conv/CMakeLists.txt
brlcad/branches/cmake/src/conv/iges/CMakeLists.txt
brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt
brlcad/branches/cmake/src/mged/points/CMakeLists.txt
brlcad/branches/cmake/src/other/libpng/CMakeLists.txt
brlcad/branches/cmake/src/util/CMakeLists.txt
Modified: brlcad/branches/cmake/src/archer/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/archer/CMakeLists.txt 2011-01-12 14:36:05 UTC
(rev 42138)
+++ brlcad/branches/cmake/src/archer/CMakeLists.txt 2011-01-12 14:55:45 UTC
(rev 42139)
@@ -1,4 +1,4 @@
-INSTALL(PROGRAMS archer DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL(PROGRAMS archer DESTINATION bin)
INSTALL(FILES itk_redefines.tcl DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/tclscripts)
set(archer_plugins
Modified: brlcad/branches/cmake/src/conv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/CMakeLists.txt 2011-01-12 14:36:05 UTC
(rev 42138)
+++ brlcad/branches/cmake/src/conv/CMakeLists.txt 2011-01-12 14:55:45 UTC
(rev 42139)
@@ -139,7 +139,7 @@
BRLCAD_ADDEXEC(g-shell.rect g-shell.rect.c "libwdb librt libbu")
-install(PROGRAMS intaval-g.py DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(PROGRAMS intaval-g.py DESTINATION bin)
INSTALL(FILES g-xxx.c DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/sample_applications)
INSTALL(FILES g-xxx_facets.c DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_DATA_DIR}/sample_applications)
Modified: brlcad/branches/cmake/src/conv/iges/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/iges/CMakeLists.txt 2011-01-12 14:36:05 UTC
(rev 42138)
+++ brlcad/branches/cmake/src/conv/iges/CMakeLists.txt 2011-01-12 14:55:45 UTC
(rev 42139)
@@ -96,14 +96,14 @@
wedge.c
)
target_link_libraries(iges-g libwdb librt libbn libbu)
-INSTALL(TARGETS iges-g RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL(TARGETS iges-g RUNTIME DESTINATION bin)
add_executable(g-iges
g-iges.c
iges.c
)
target_link_libraries(g-iges librt libbu)
-INSTALL(TARGETS g-iges RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL(TARGETS g-iges RUNTIME DESTINATION bin)
SET(iges_MANS
g-iges.1
Modified: brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt 2011-01-12
14:36:05 UTC (rev 42138)
+++ brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt 2011-01-12
14:55:45 UTC (rev 42139)
@@ -18,4 +18,4 @@
write_brl.cpp
)
target_link_libraries(tgf-g libwdb librt libbu)
-INSTALL(TARGETS tgf-g RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL(TARGETS tgf-g RUNTIME DESTINATION bin)
Modified: brlcad/branches/cmake/src/mged/points/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/mged/points/CMakeLists.txt 2011-01-12
14:36:05 UTC (rev 42138)
+++ brlcad/branches/cmake/src/mged/points/CMakeLists.txt 2011-01-12
14:55:45 UTC (rev 42139)
@@ -20,5 +20,5 @@
add_library(libpoints ${MGED_POINTS_SRCS})
target_link_libraries(libpoints libbu)
-INSTALL(TARGETS libpoints DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+INSTALL(TARGETS libpoints DESTINATION lib)
SET_TARGET_PROPERTIES(libpoints PROPERTIES COMPILE_DEFINITIONS "ENABLE_POINTS")
Modified: brlcad/branches/cmake/src/other/libpng/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libpng/CMakeLists.txt 2011-01-12
14:36:05 UTC (rev 42138)
+++ brlcad/branches/cmake/src/other/libpng/CMakeLists.txt 2011-01-12
14:55:45 UTC (rev 42139)
@@ -231,11 +231,11 @@
# CREATE PKGCONFIG FILES
# we use the same files like ./configure, so we have to set its vars
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
- set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
+ set(CMAKE_INSTALL_LIBDIR lib)
endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-set(libdir ${CMAKE_INSTALL_LIBDIR})
+set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
set(includedir ${CMAKE_INSTALL_PREFIX}/include)
set(LIBS "-lz -lm")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
Modified: brlcad/branches/cmake/src/util/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/util/CMakeLists.txt 2011-01-12 14:36:05 UTC
(rev 42138)
+++ brlcad/branches/cmake/src/util/CMakeLists.txt 2011-01-12 14:55:45 UTC
(rev 42139)
@@ -153,7 +153,7 @@
BRLCAD_ADDEXEC(xyz-pl xyz-pl.c "libbn libbu" STRICT)
BRLCAD_ADDEXEC(yuv-pix yuv-pix.c "libfb libbn libbu" STRICT)
-INSTALL(PROGRAMS morphedit.tcl DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL(PROGRAMS morphedit.tcl DESTINATION bin)
add_executable(roots_example roots_example.c)
target_link_libraries(roots_example libbu librt)
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
