Revision: 40486
http://brlcad.svn.sourceforge.net/brlcad/?rev=40486&view=rev
Author: starseeker
Date: 2010-09-07 02:38:57 +0000 (Tue, 07 Sep 2010)
Log Message:
-----------
Another tidbit from the CMake list - take out the LIBRARY part of the INSTALL
command for libraries (ARCHIVES are static libraries, apparently) and turning
off BUILD_SHARED_LIBS actually results in a build.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/cmake/src/adrt/CMakeLists.txt
brlcad/branches/cmake/src/libanalyze/CMakeLists.txt
brlcad/branches/cmake/src/libbn/CMakeLists.txt
brlcad/branches/cmake/src/libbu/CMakeLists.txt
brlcad/branches/cmake/src/libcursor/CMakeLists.txt
brlcad/branches/cmake/src/libdm/CMakeLists.txt
brlcad/branches/cmake/src/libfb/CMakeLists.txt
brlcad/branches/cmake/src/libfft/CMakeLists.txt
brlcad/branches/cmake/src/libgcv/CMakeLists.txt
brlcad/branches/cmake/src/libged/CMakeLists.txt
brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt
brlcad/branches/cmake/src/liboptical/CMakeLists.txt
brlcad/branches/cmake/src/liborle/CMakeLists.txt
brlcad/branches/cmake/src/libpkg/CMakeLists.txt
brlcad/branches/cmake/src/librt/CMakeLists.txt
brlcad/branches/cmake/src/libsysv/CMakeLists.txt
brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
brlcad/branches/cmake/src/libtermio/CMakeLists.txt
brlcad/branches/cmake/src/libwdb/CMakeLists.txt
brlcad/branches/cmake/src/vfont/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-06 19:35:36 UTC (rev
40485)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-07 02:38:57 UTC (rev
40486)
@@ -1375,6 +1375,7 @@
STRING(REGEX REPLACE ";" "\\\;" EXEC_TARGET_FILES
"${CMAKE_EXEC_TARGET_FILE_LIST}")
SET(noprod_file "
SET(CMAKE_LIBRARY_TARGET_FILE_LIST \"${LIBRARY_TARGET_FILES}\")
+ MESSAGE(\"current dir: \${CMAKE_CURRENT_BINARY_DIR}\\n\")
FOREACH(file \${CMAKE_LIBRARY_TARGET_FILE_LIST})
IF(EXISTS \${file})
MESSAGE(\"removing \${file}\\n\")
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -11,5 +11,5 @@
STRING(REGEX REPLACE " " ";" libslist "${libs}")
add_library(${libname} ${srcslist})
target_link_libraries(${libname} ${libslist})
- INSTALL(TARGETS ${libname} LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+ INSTALL(TARGETS ${libname} DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
ENDMACRO(BRLCAD_ADDLIB libname srcs libs)
Modified: brlcad/branches/cmake/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/adrt/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/adrt/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -20,7 +20,7 @@
SET_TARGET_PROPERTIES(tie0 PROPERTIES COMPILE_DEFINITIONS "TIE_PRECISION=0")
add_library(tie ${LIBTIE_PRECISION_SRCS})
target_link_libraries(tie tie0 bu)
-INSTALL(TARGETS tie LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS tie DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
SET_TARGET_PROPERTIES(tie PROPERTIES COMPILE_DEFINITIONS "TIE_PRECISION=1")
SET(LIBRENDER_SRCS
@@ -53,7 +53,7 @@
)
add_library(render ${LIBRENDER_SRCS})
target_link_libraries(render tie gcv)
-INSTALL(TARGETS render LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS render DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
SET(ADRT_MASTER_SRCS
master/compnet.c
Modified: brlcad/branches/cmake/src/libanalyze/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libanalyze/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libanalyze/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -16,4 +16,4 @@
add_library(analyze ${LIBANALYZE_SOURCES})
target_link_libraries(analyze bu)
-INSTALL(TARGETS analyze LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS analyze DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/libbn/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libbn/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libbn/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -43,6 +43,6 @@
add_library(bn ${LIBBN_SOURCES})
target_link_libraries(bn bu)
-INSTALL(TARGETS bn LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS bn DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
install(FILES libplot3.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -88,7 +88,7 @@
add_library(bu ${LIBBU_SOURCES})
target_link_libraries(bu ${CMAKE_THREAD_LIBS_INIT} ${BRLCAD_PNG_LIB_NAME}
${TCL_LIBRARY} )
-INSTALL(TARGETS bu LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS bu DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
set(HTESTER_SOURCES
htester.c
Modified: brlcad/branches/cmake/src/libcursor/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libcursor/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libcursor/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -12,6 +12,6 @@
add_library(cursor cursor.c)
target_link_libraries(cursor ${BRLCAD_TERMLIB_LIBRARY})
-INSTALL(TARGETS cursor LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS cursor DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
install(FILES libcursor.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -65,5 +65,5 @@
add_library(dm ${LIBDM_SRCS})
MESSAGE("X11_LIBRARIES: ${X11_LIBRARIES} ${X11_Xi_LIB}")
target_link_libraries(dm librt fb ged ${X11_LIBRARIES} ${X11_Xi_LIB})
-INSTALL(TARGETS dm LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS dm DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/libfb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libfb/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libfb/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -56,6 +56,6 @@
add_library(fb ${LIBFB_SOURCES})
target_link_libraries(fb bu pkg ${BRLCAD_PNG_LIB_NAME} ${TCL_LIBRARY}
${TK_LIBRARY} ${LINKLIBS})
-INSTALL(TARGETS fb LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS fb DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
install(FILES libfb.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libfft/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libfft/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libfft/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -42,7 +42,7 @@
)
add_library(fft ${LIBFFT_SRCS})
target_link_libraries(fft)
-INSTALL(TARGETS fft LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS fft DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
SET_TARGET_PROPERTIES(fft PROPERTIES LINKER_LANGUAGE C)
add_executable(fftest fftest.c)
Modified: brlcad/branches/cmake/src/libgcv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libgcv/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libgcv/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -16,4 +16,4 @@
add_library(gcv ${LIBGCV_SOURCES})
target_link_libraries(gcv bu librt)
-INSTALL(TARGETS gcv LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS gcv DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/libged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libged/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libged/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -272,4 +272,4 @@
add_library(ged ${LIBGED_SOURCES})
target_link_libraries(ged bu librt wdb analyze)
-INSTALL(TARGETS ged LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS ged DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt 2010-09-06
19:35:36 UTC (rev 40485)
+++ brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt 2010-09-07
02:38:57 UTC (rev 40486)
@@ -11,4 +11,4 @@
add_library(multispectral init.c sh_temp.c)
target_link_libraries(multispectral optical librt)
-INSTALL(TARGETS multispectral LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS multispectral DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/liboptical/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/liboptical/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -53,4 +53,4 @@
add_library(optical ${LIBOPTICAL_SOURCES})
target_link_libraries(optical bu bn librt)
-INSTALL(TARGETS optical LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS optical DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/liborle/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/liborle/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/liborle/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -14,6 +14,6 @@
)
add_library(orle ${LIBORLE_SOURCES})
-INSTALL(TARGETS orle LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS orle DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
install(FILES liborle.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libpkg/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libpkg/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libpkg/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -17,4 +17,4 @@
add_library(pkg ${LIBPKG_SOURCES})
target_link_libraries(pkg bu)
-INSTALL(TARGETS pkg LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS pkg DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/librt/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/librt/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -257,6 +257,6 @@
add_library(librt ${LIBRT_SOURCES})
set_target_properties(librt PROPERTIES PREFIX "")
target_link_libraries(librt bu bn ${BRLCAD_OPENNURBS_LIBRARY}
${BRLCAD_REGEX_LIBRARY} ${BRLCAD_ZLIB_LIBRARY} ${TCL_LIBRARY})
-INSTALL(TARGETS librt LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS librt DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
install(FILES librt.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libsysv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libsysv/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libsysv/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -24,4 +24,4 @@
add_library(sysv ${LIBSYSV_SOURCES})
target_link_libraries(sysv ${TCL_LIBRARY})
-INSTALL(TARGETS sysv LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS sysv DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -31,4 +31,4 @@
add_library(tclcad tclcad.c tclcadAutoPath.c tkImgFmtPIX.c ged_obj.c)
target_link_libraries(tclcad dm ged ${X11_LIBRARIES} ${X11_Xi_LIB})
-INSTALL(TARGETS tclcad LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS tclcad DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/libtermio/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libtermio/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libtermio/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -11,4 +11,4 @@
add_library(termio termio.c)
target_link_libraries(termio ${BRLCAD_TERMLIB_LIBRARY})
-INSTALL(TARGETS termio LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS termio DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Modified: brlcad/branches/cmake/src/libwdb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libwdb/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/libwdb/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -49,6 +49,6 @@
add_library(wdb ${LIBWDB_SOURCES})
target_link_libraries(wdb librt bu bn sysv ${BRLCAD_OPENNURBS_LIBRARY}
${BRLCAD_REGEX_LIBRARY} ${BRLCAD_ZLIB_LIBRARY} ${TCL_LIBRARY})
-INSTALL(TARGETS wdb LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS wdb DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
install(FILES libwdb.3 DESTINATION ${BRLCAD_INSTALL_MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/vfont/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-06 19:35:36 UTC
(rev 40485)
+++ brlcad/branches/cmake/src/vfont/CMakeLists.txt 2010-09-07 02:38:57 UTC
(rev 40486)
@@ -9,7 +9,7 @@
)
add_library(vfont getfont.c)
-INSTALL(TARGETS vfont LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+INSTALL(TARGETS vfont DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fix.6r DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/vfont)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/nonie.r.12 DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/vfont)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
