[brlcad-commits] SF.net SVN: brlcad:[42789] brlcad/branches/cmake/misc/CMake/ThirdParty. cmake
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2011-01-31 05:18:02
|
Revision: 42789 http://brlcad.svn.sourceforge.net/brlcad/?rev=42789&view=rev Author: starseeker Date: 2011-01-31 05:17:55 +0000 (Mon, 31 Jan 2011) Log Message: ----------- Don't force the third party lib off if it's been set on elsewhere, mark vars as advanced Modified Paths: -------------- brlcad/branches/cmake/misc/CMake/ThirdParty.cmake Modified: brlcad/branches/cmake/misc/CMake/ThirdParty.cmake =================================================================== --- brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2011-01-31 03:01:27 UTC (rev 42788) +++ brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2011-01-31 05:17:55 UTC (rev 42789) @@ -5,12 +5,14 @@ SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} ON CACHE BOOL "Build the local ${upper} library." FORCE) ELSE(${CMAKE_PROJECT_NAME}-ENABLE_ALL_LOCAL_LIBS) OPTION(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} "Build the local ${upper} library." OFF) - SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OFF CACHE BOOL "Build the local ${upper} library." FORCE) ENDIF(${CMAKE_PROJECT_NAME}-ENABLE_ALL_LOCAL_LIBS) IF(NOT ${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OR ${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY) SET(${upper}_FOUND "${upper}-NOTFOUND" CACHE STRING "${upper}_FOUND" FORCE) + MARK_AS_ADVANCED(${upper}_FOUND) SET(${upper}_LIBRARY "${upper}-NOTFOUND" CACHE STRING "${upper}_LIBRARY" FORCE) + MARK_AS_ADVANCED(${upper}_LIBRARY) SET(${upper}_INCLUDE_DIR "${upper}-NOTFOUND" CACHE STRING "${upper}_INCLUDE_DIR" FORCE) + MARK_AS_ADVANCED(${upper}_INCLUDE_DIR) IF(EXISTS ${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake) INCLUDE(${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake) ELSE(EXISTS ${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |