[brlcad-commits] SF.net SVN: brlcad:[40959] brlcad/branches/cmake/misc/CMake/ThirdParty. cmake

[<sta...@us...>]

Revision: 40959
          http://brlcad.svn.sourceforge.net/brlcad/?rev=40959&view=rev
Author:   starseeker
Date:     2010-10-09 03:24:12 +0000 (Sat, 09 Oct 2010)

Log Message:
-----------
Windows reveals that zconf.h is actually in the CMake build directory, and thus is actually going to require that that directory be included when no system zconf.h is around - account for this generally in the third party options.

Modified Paths:
--------------
    brlcad/branches/cmake/misc/CMake/ThirdParty.cmake

Modified: brlcad/branches/cmake/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/ThirdParty.cmake	2010-10-08 23:36:54 UTC (rev 40958)
+++ brlcad/branches/cmake/misc/CMake/ThirdParty.cmake	2010-10-09 03:24:12 UTC (rev 40959)
@@ -49,7 +49,7 @@
 MACRO(THIRD_PARTY_SUBDIR upper lower)
 	IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT ${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
 		ADD_SUBDIRECTORY(${lower})
-		SET(${upper}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${lower} CACHE STRING "set by THIRD_PARTY_SUBDIR macro" FORCE)
+		SET(${upper}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${lower};${CMAKE_CURRENT_BINARY_DIR}/${lower} CACHE STRING "set by THIRD_PARTY_SUBDIR macro" FORCE)
 	ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT ${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
 ENDMACRO(THIRD_PARTY_SUBDIR)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.