Revision: 42414
http://brlcad.svn.sourceforge.net/brlcad/?rev=42414&view=rev
Author: starseeker
Date: 2011-01-18 18:03:35 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Make the CMake library target logic a bit more generic. A lot of these files
should probably be worked into being proper stand-alone CMakeLists.txt files.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt
brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt
brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt
brlcad/branches/cmake/src/other/tktable/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2011-01-18 16:21:58 UTC (rev
42413)
+++ brlcad/branches/cmake/CMakeLists.txt 2011-01-18 18:03:35 UTC (rev
42414)
@@ -1038,7 +1038,7 @@
ENDFOREACH()
MESSAGE("")
IF(CMAKE_BUILD_TYPE MATCHES "^Basic$")
- SET(CMAKE_ALL_C_FLAGS "${CMAKE_C_FLAGS} -DCMAKE_HEADERS")
+ SET(CMAKE_ALL_C_FLAGS "${CMAKE_C_FLAGS}")
SET(CMAKE_ALL_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif()
IF(CMAKE_BUILD_TYPE MATCHES "^Debug$")
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2011-01-18 16:21:58 UTC
(rev 42413)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2011-01-18 18:03:35 UTC
(rev 42414)
@@ -52,6 +52,7 @@
MARK_AS_ADVANCED(SKIP_INSTALL_EXPORT)
SET(PNG_MAN_DIR ${MAN_DIR} CACHE STRING "Set PNG_MAN_DIR to the global
MAN_DIR" FORCE)
MARK_AS_ADVANCED(PNG_MAN_DIR)
+SET(CMAKE_INSTALL_LIBDIR ${LIB_DIR})
THIRD_PARTY_SUBDIR(PNG libpng)
IF(BRLCAD_BUILD_LOCAL_PNG)
# PNG_LIB_NAME doesn't automatically propogate to toplevel due to
scoping of CMake variables -
Modified: brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2011-01-18
16:21:58 UTC (rev 42413)
+++ brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2011-01-18
18:03:35 UTC (rev 42414)
@@ -21,9 +21,9 @@
ENDIF(MSVC)
add_library(regex SHARED ${LIBREGEX_SOURCES})
-INSTALL(TARGETS regex DESTINATION lib)
+INSTALL(TARGETS regex DESTINATION ${LIB_DIR})
add_library(regex-static STATIC ${LIBREGEX_SOURCES})
-INSTALL(TARGETS regex-static ARCHIVE DESTINATION lib)
+INSTALL(TARGETS regex-static ARCHIVE DESTINATION ${LIB_DIR})
IF(NOT WIN32)
SET_TARGET_PROPERTIES(regex-static PROPERTIES OUTPUT_NAME "regex")
ENDIF(NOT WIN32)
Modified: brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt 2011-01-18
16:21:58 UTC (rev 42413)
+++ brlcad/branches/cmake/src/other/libtermlib/CMakeLists.txt 2011-01-18
18:03:35 UTC (rev 42414)
@@ -20,10 +20,10 @@
)
add_library(termlib SHARED ${LIBTERM_SOURCES})
-INSTALL(TARGETS termlib DESTINATION lib)
+INSTALL(TARGETS termlib DESTINATION ${LIB_DIR})
add_library(termlib-static STATIC ${LIBTERM_SOURCES})
-INSTALL(TARGETS termlib-static ARCHIVE DESTINATION lib)
+INSTALL(TARGETS termlib-static ARCHIVE DESTINATION ${LIB_DIR})
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)
Modified: brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2011-01-18
16:21:58 UTC (rev 42413)
+++ brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2011-01-18
18:03:35 UTC (rev 42414)
@@ -59,13 +59,13 @@
add_library(utahrle SHARED ${LIBUTAHRLE_SOURCES})
target_link_libraries(utahrle ${M_LIBRARY})
-INSTALL(TARGETS utahrle DESTINATION lib)
+INSTALL(TARGETS utahrle DESTINATION ${LIB_DIR})
add_library(utahrle-static STATIC ${LIBUTAHRLE_SOURCES})
target_link_libraries(utahrle-static ${M_LIBRARY})
IF(NOT WIN32)
SET_TARGET_PROPERTIES(utahrle-static PROPERTIES OUTPUT_NAME "utahrle")
ENDIF(NOT WIN32)
-INSTALL(TARGETS utahrle-static ARCHIVE DESTINATION lib)
+INSTALL(TARGETS utahrle-static ARCHIVE DESTINATION ${LIB_DIR})
SET(LIBUTAHRLE_MAN3
buildmap.3
Modified: brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2011-01-18
16:21:58 UTC (rev 42413)
+++ brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2011-01-18
18:03:35 UTC (rev 42414)
@@ -268,7 +268,7 @@
add_library(openNURBS SHARED ${OPENNURBS_SOURCES})
target_link_libraries(openNURBS ${OPENNURBS_LINKLIBRARIES})
set_property(TARGET openNURBS PROPERTY LINK_INTERFACE_LIBRARIES "")
- install(TARGETS openNURBS DESTINATION lib)
+ install(TARGETS openNURBS DESTINATION ${LIB_DIR})
ENDIF(BUILD_SHARED_LIBS)
IF(NOT MSVC)
IF(BUILD_STATIC_LIBS)
@@ -277,7 +277,7 @@
IF(NOT WIN32)
SET_TARGET_PROPERTIES(openNURBS-static PROPERTIES OUTPUT_NAME
"openNURBS")
ENDIF(NOT WIN32)
- install(TARGETS openNURBS-static ARCHIVE DESTINATION lib)
+ install(TARGETS openNURBS-static ARCHIVE DESTINATION ${LIB_DIR})
ENDIF(BUILD_STATIC_LIBS)
ENDIF(NOT MSVC)
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2011-01-18 16:21:58 UTC
(rev 42413)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2011-01-18 18:03:35 UTC
(rev 42414)
@@ -127,7 +127,7 @@
FILE(APPEND ${TCL_CFG_H_FILE} "#define PACKAGE_VERSION
\"${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}\"\n")
FILE(APPEND ${TCL_CFG_H_FILE} "#define PACKAGE_STRING \"tcl
${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}\"\n")
FILE(APPEND ${TCL_CFG_H_FILE} "#define TCL_PACKAGE_PATH
\"${CMAKE_INSTALL_PREFIX}/lib\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define TCL_LIBRARY
\"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}\"\n")
+FILE(APPEND ${TCL_CFG_H_FILE} "#define TCL_LIBRARY
\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}\"\n")
FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_INSTALL_LIBDIR
\"${CMAKE_INSTALL_PREFIX}/lib\"\n")
FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_INSTALL_BINDIR
\"${CMAKE_INSTALL_PREFIX}/bin\"\n")
FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_INSTALL_SCRDIR
\"${CMAKE_INSTALL_PREFIX}/scripts\"\n")
@@ -715,7 +715,7 @@
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TCL_CFLAGS}")
add_library(tcl ${TCL_SRCS})
-install(TARGETS tcl DESTINATION lib)
+install(TARGETS tcl DESTINATION ${LIB_DIR})
target_link_libraries(tcl ${COREFOUNDATION_FRAMEWORK} ${TCL_LINK_LIBS}
${DL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
GET_TARGET_PROPERTY(TCL_INSTALL_LIBNAME tcl LOCATION)
SET_TARGET_PROPERTIES(tcl PROPERTIES VERSION ${TCL_VERSION} SOVERSION
${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR})
@@ -729,7 +729,7 @@
add_library(tclstub STATIC ${TCL_STUB_SRCS})
target_link_libraries(tclstub ${CMAKE_THREAD_LIBS_INIT}
${COREFOUNDATION_FRAMEWORK} ${M_LIBRARY} ${DL_LIBRARY})
-install(TARGETS tclstub DESTINATION lib)
+install(TARGETS tclstub DESTINATION ${LIB_DIR})
add_executable(tclsh ${TCLSH_SRCS})
target_link_libraries(tclsh tcl ${EXTRA_TCLSH_LIBS})
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-18 16:21:58 UTC
(rev 42413)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-18 18:03:35 UTC
(rev 42414)
@@ -570,7 +570,7 @@
ELSE(WIN32)
target_link_libraries(tk tcl ${COREFOUNDATION_FRAMEWORK} ${X11_TK_LIBS}
${TK_FREETYPE_LIBRARIES} ${TK_FONTCONFIG_LIBRARY})
ENDIF(WIN32)
-install(TARGETS tk DESTINATION lib)
+install(TARGETS tk DESTINATION ${LIB_DIR})
SET_TARGET_PROPERTIES(tk PROPERTIES VERSION ${TK_VERSION} SOVERSION
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR})
GET_TARGET_PROPERTY(TK_LIBLOCATION tk LOCATION_${CMAKE_BUILD_TYPE})
@@ -582,7 +582,7 @@
add_library(tkstub STATIC ${TK_STUB_SRCS})
-install(TARGETS tkstub DESTINATION lib)
+install(TARGETS tkstub DESTINATION ${LIB_DIR})
install(FILES ${TK_HDRS} DESTINATION include)
Modified: brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt 2011-01-18
16:21:58 UTC (rev 42413)
+++ brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt 2011-01-18
18:03:35 UTC (rev 42414)
@@ -75,7 +75,7 @@
ELSE(WIN32)
target_link_libraries(Tkhtml ${TCL_LIBRARY} ${TCL_TK_LIBRARY}
${TCL_STUB_LIBRARIES} ${X11_LIBRARIES})
ENDIF(WIN32)
-install(TARGETS Tkhtml DESTINATION lib)
+install(TARGETS Tkhtml DESTINATION ${LIB_DIR})
# Create the pkgIndex.tcl file.
GET_TARGET_PROPERTY(TKHTML_LIBLOCATION Tkhtml LOCATION_${CMAKE_BUILD_TYPE})
Modified: brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt 2011-01-18
16:21:58 UTC (rev 42413)
+++ brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt 2011-01-18
18:03:35 UTC (rev 42414)
@@ -17,7 +17,7 @@
add_library(tkpng SHARED ${TKPNG_SRCS})
target_link_libraries(tkpng ${TCL_LIBRARY} ${TCL_TK_LIBRARY} ${ZLIB_LIBRARY}
${X11_LIBRARIES})
-install(TARGETS tkpng DESTINATION lib)
+install(TARGETS tkpng DESTINATION ${LIB_DIR})
# Create the pkgIndex.tcl file.
GET_TARGET_PROPERTY(TKPNG_LIBLOCATION tkpng LOCATION_${CMAKE_BUILD_TYPE})
Modified: brlcad/branches/cmake/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-18
16:21:58 UTC (rev 42413)
+++ brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-18
18:03:35 UTC (rev 42414)
@@ -61,7 +61,7 @@
add_library(Tktable SHARED ${TKTABLE_SRCS})
add_dependencies(Tktable tktable_header_gen)
target_link_libraries(Tktable ${TCL_LIBRARY} ${TCL_TK_LIBRARY}
${X11_LIBRARIES})
-install(TARGETS Tktable DESTINATION lib)
+install(TARGETS Tktable DESTINATION ${LIB_DIR})
# Create the pkgIndex.tcl file.
GET_TARGET_PROPERTY(TKTABLE_LIBLOCATION Tktable LOCATION_${CMAKE_BUILD_TYPE})
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
