Revision: 59045
http://sourceforge.net/p/brlcad/code/59045
Author: bob1961
Date: 2013-12-19 16:40:56 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Cliff tweaks for building on Windows.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt
brlcad/trunk/misc/attributes/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-12-19 16:39:21 UTC (rev 59044)
+++ brlcad/trunk/CMakeLists.txt 2013-12-19 16:40:56 UTC (rev 59045)
@@ -2240,7 +2240,7 @@
try_compile(BUILD_SLEEP
"${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp"
"${BRLCAD_CMAKE_DIR}/test_srcs/sleep.c"
- COMPILE_DEFINITIONS -I${CMAKE_CURRENT_BINARY_DIR}/include
-I${CMAKE_CURRENT_SOURCE_DIR}/include
+ COMPILE_DEFINITIONS -DBRLCADBUILD -DHAVE_CONFIG_H
-I${CMAKE_CURRENT_BINARY_DIR}/include -I${CMAKE_CURRENT_SOURCE_DIR}/include
OUTPUT_VARIABLE BUILD_SLEEP_LOG
COPY_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp/sleep.bin")
if(NOT BUILD_SLEEP)
Modified: brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt 2013-12-19
16:39:21 UTC (rev 59044)
+++ brlcad/trunk/doc/docbook/system/man5/en/CMakeLists.txt 2013-12-19
16:40:56 UTC (rev 59045)
@@ -35,7 +35,11 @@
endif(BRLCAD_EXTRADOCS_PDF_MAN)
add_dependencies(attributes_man5_html attr_std_list_xml attr_std_table_xml)
-add_dependencies(attributes_man5_man attr_std_list_xml attr_std_table_xml)
+
+if(BRLCAD_EXTRADOCS_MAN)
+ add_dependencies(attributes_man5_man attr_std_list_xml attr_std_table_xml)
+endif(BRLCAD_EXTRADOCS_MAN)
+
if(BRLCAD_EXTRADOCS_PDF_MAN)
add_dependencies(attributes_man5_pdf attr_std_list_xml attr_std_table_xml)
endif(BRLCAD_EXTRADOCS_PDF_MAN)
Modified: brlcad/trunk/misc/attributes/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/attributes/CMakeLists.txt 2013-12-19 16:39:21 UTC (rev
59044)
+++ brlcad/trunk/misc/attributes/CMakeLists.txt 2013-12-19 16:40:56 UTC (rev
59045)
@@ -4,6 +4,7 @@
${BRLCAD_SOURCE_DIR}/src/librt
${OPENNURBS_INCLUDE_DIR}
${BU_INCLUDE_DIRS}
+ ${RT_INCLUDE_DIRS}
)
# a new html and xml generation file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
