Revision: 42259
http://brlcad.svn.sourceforge.net/brlcad/?rev=42259&view=rev
Author: starseeker
Date: 2011-01-14 13:43:50 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
Start updating the CMake logic to re-create the installed file layout, insofar
as practical. First step - header placement (cause there are fewer of these).
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/include/CMakeLists.txt
brlcad/branches/cmake/src/adrt/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
brlcad/branches/cmake/src/other/tcl/generic/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
brlcad/branches/cmake/src/other/tnt/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2011-01-14 10:13:14 UTC (rev
42258)
+++ brlcad/branches/cmake/CMakeLists.txt 2011-01-14 13:43:50 UTC (rev
42259)
@@ -398,7 +398,7 @@
# run this macro, the config.h.in file must first be present, which
# we take care of here:
-SET(CONFIG_H_FILE "${BRLCAD_BINARY_DIR}/include/brlcad_config.h.in")
+SET(CONFIG_H_FILE "${BRLCAD_BINARY_DIR}/include/brlcad/brlcad_config.h.in")
FILE(WRITE ${CONFIG_H_FILE} "/**** Define statements for CMake ****/\n")
FILE(APPEND ${CONFIG_H_FILE} "#ifndef __CONFIG_H__\n")
FILE(APPEND ${CONFIG_H_FILE} "#define __CONFIG_H__\n")
@@ -964,7 +964,7 @@
# idea being that if any other system-wide defines or include are needed
# they can just be added here.
SET(BRLCAD_STD_DEFS "-DHAVE_CONFIG_H;-DBRLCADBUILD=1")
-SET(BRLCAD_STD_INCLUDES
"${BRLCAD_BINARY_DIR}/include;${BRLCAD_SOURCE_DIR}/include")
+SET(BRLCAD_STD_INCLUDES
"${BRLCAD_BINARY_DIR}/include/brlcad;${BRLCAD_BINARY_DIR}/include")
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(db)
@@ -983,7 +983,7 @@
# Now that all the tests are done, configure the brlcad_config.h file:
FILE(APPEND ${CONFIG_H_FILE} "#endif /* __CONFIG_H__ */\n")
-configure_file(${CONFIG_H_FILE} ${BRLCAD_BINARY_DIR}/include/brlcad_config.h)
+configure_file(${CONFIG_H_FILE}
${BRLCAD_BINARY_DIR}/include/brlcad/brlcad_config.h)
# Before we finalize, set some specific global compiler flags
IF(MSVC)
Modified: brlcad/branches/cmake/include/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/include/CMakeLists.txt 2011-01-14 10:13:14 UTC
(rev 42258)
+++ brlcad/branches/cmake/include/CMakeLists.txt 2011-01-14 13:43:50 UTC
(rev 42259)
@@ -1,7 +1,6 @@
SET(brlcadinclude_required
RtServerImpl.h
bn.h
- ${CMAKE_CURRENT_BINARY_DIR}/brlcad_config.h
bu.h
common.h
config_win.h
@@ -81,8 +80,11 @@
sysv.h
)
+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)
IF(NOT BRLCAD-BUILD_BENCHMARK_ONLY AND NOT BRLCAD-BUILD_RTSERVER_ONLY)
+ FILE(COPY ${brlcadinclude_wanted} DESTINATION
${CMAKE_BINARY_DIR}/include/brlcad)
INSTALL(FILES ${brlcadinclude_wanted} DESTINATION include/brlcad)
ENDIF(NOT BRLCAD-BUILD_BENCHMARK_ONLY AND NOT BRLCAD-BUILD_RTSERVER_ONLY)
Modified: brlcad/branches/cmake/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/adrt/CMakeLists.txt 2011-01-14 10:13:14 UTC
(rev 42258)
+++ brlcad/branches/cmake/src/adrt/CMakeLists.txt 2011-01-14 13:43:50 UTC
(rev 42259)
@@ -99,4 +99,5 @@
librender/texture_internal.h
libtie/tie.h
)
+FILE(COPY ${tie_HDRS} DESTINATION ${CMAKE_BINARY_DIR}/include/tie)
INSTALL(FILES ${tie_HDRS} DESTINATION include/tie)
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2011-01-14 10:13:14 UTC
(rev 42258)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2011-01-14 13:43:50 UTC
(rev 42259)
@@ -22,6 +22,16 @@
FILE(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/libz/zconf.h)
THIRD_PARTY_OPTION(ZLIB zlib)
THIRD_PARTY_SUBDIR(ZLIB libz)
+IF(BRLCAD_BUILD_LOCAL_ZLIB)
+ get_directory_property(ZLIB_PUBLIC_HDRS DIRECTORY libz DEFINITION
ZLIB_PUBLIC_HDRS)
+ FOREACH(zlib_hdr ${ZLIB_PUBLIC_HDRS})
+ IF(EXISTS ${zlib_hdr})
+ FILE(COPY ${zlib_hdr} DESTINATION
${CMAKE_BINARY_DIR}/include)
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libz/${zlib_hdr})
+ FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/libz/${zlib_hdr}
DESTINATION ${CMAKE_BINARY_DIR}/include)
+ ENDIF(EXISTS ${zlib_hdr})
+ ENDFOREACH(zlib_hdr ${ZLIB_PUBLIC_HDRS})
+ENDIF(BRLCAD_BUILD_LOCAL_ZLIB)
# libtermlib Library
THIRD_PARTY_OPTION(TERMLIB termlib)
@@ -48,6 +58,16 @@
# use get_directory_property to recover the value and place it in the
CACHE
get_directory_property(PNG_LIBRARY DIRECTORY libpng DEFINITION
PNG_LIB_NAME)
SET(PNG_LIBRARY "${PNG_LIBRARY}" CACHE STRING "libpng name for targets"
FORCE)
+ get_directory_property(libpng_public_hdrs DIRECTORY libpng DEFINITION
libpng_public_hdrs)
+ FOREACH(png_hdr ${libpng_public_hdrs})
+ IF(EXISTS ${png_hdr})
+ FILE(COPY ${png_hdr} DESTINATION
${CMAKE_BINARY_DIR}/include)
+ FILE(COPY ${png_hdr} DESTINATION
${CMAKE_BINARY_DIR}/include/lib${PNG_LIBRARY})
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libpng/${png_hdr})
+ FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/libpng/${png_hdr}
DESTINATION ${CMAKE_BINARY_DIR}/include)
+ FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/libpng/${png_hdr}
DESTINATION ${CMAKE_BINARY_DIR}/include/lib${PNG_LIBRARY})
+ ENDIF(EXISTS ${png_hdr})
+ ENDFOREACH(png_hdr ${libpng_public_hdrs})
ELSE(BRLCAD_BUILD_LOCAL_PNG)
# The PNG CMake file seems to set PNG_PNG_INCLUDE_DIR rather than
PNG_INCLUDE_DIR, so
# a generic macro won't pick up the setting - handle it here
Modified: brlcad/branches/cmake/src/other/libregex/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2011-01-14
10:13:14 UTC (rev 42258)
+++ brlcad/branches/cmake/src/other/libregex/CMakeLists.txt 2011-01-14
13:43:50 UTC (rev 42259)
@@ -28,5 +28,6 @@
SET_TARGET_PROPERTIES(regex-static PROPERTIES OUTPUT_NAME "regex")
ENDIF(NOT WIN32)
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+ FILE(COPY ${LIBREGEX_PUBLIC_HDRS} DESTINATION
${CMAKE_BINARY_DIR}/include)
install(FILES ${LIBREGEX_PUBLIC_HDRS} DESTINATION include)
endif()
Modified: brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2011-01-14
10:13:14 UTC (rev 42258)
+++ brlcad/branches/cmake/src/other/libutahrle/CMakeLists.txt 2011-01-14
13:43:50 UTC (rev 42259)
@@ -123,5 +123,6 @@
install(FILES ${LIBUTAHRLE_MAN3} DESTINATION ${MAN_DIR}/man3)
install(FILES rle.5 DESTINATION ${MAN_DIR}/man5)
INSTALL(FILES ${LIBUTAHRLE_PUBLIC_HDRS} DESTINATION include)
+ FILE(COPY ${LIBUTAHRLE_PUBLIC_HDRS} DESTINATION
${CMAKE_BINARY_DIR}/include)
endif()
Modified: brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2011-01-14
10:13:14 UTC (rev 42258)
+++ brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2011-01-14
13:43:50 UTC (rev 42259)
@@ -281,5 +281,5 @@
ENDIF(BUILD_STATIC_LIBS)
ENDIF(NOT MSVC)
-
+FILE(COPY ${OPENNURBS_HEADERS} DESTINATION
${CMAKE_BINARY_DIR}/include/openNURBS)
install(FILES ${OPENNURBS_HEADERS} DESTINATION include/openNURBS)
Modified: brlcad/branches/cmake/src/other/tcl/generic/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/generic/CMakeLists.txt 2011-01-14
10:13:14 UTC (rev 42258)
+++ brlcad/branches/cmake/src/other/tcl/generic/CMakeLists.txt 2011-01-14
13:43:50 UTC (rev 42259)
@@ -77,3 +77,4 @@
generic/tclDecls.h
generic/tclPlatDecls.h
)
+FILE(COPY ${TCL_GENERIC_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include)
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-14 10:13:14 UTC
(rev 42258)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-14 13:43:50 UTC
(rev 42259)
@@ -312,6 +312,7 @@
generic/tkDecls.h
generic/tkPlatDecls.h
)
+FILE(COPY ${TK_HDRS} DESTINATION ${CMAKE_BINARY_DIR}/include)
SET(TTK_SRCS
generic/ttk/ttkBlink.c
Modified: brlcad/branches/cmake/src/other/tnt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tnt/CMakeLists.txt 2011-01-14 10:13:14 UTC
(rev 42258)
+++ brlcad/branches/cmake/src/other/tnt/CMakeLists.txt 2011-01-14 13:43:50 UTC
(rev 42259)
@@ -29,4 +29,5 @@
tnt_vector.h
tnt_version.h
)
+FILE(COPY ${tnt_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/include)
INSTALL(FILES ${tnt_HEADERS} DESTINATION include)
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
