Revision: 40558
http://brlcad.svn.sourceforge.net/brlcad/?rev=40558&view=rev
Author: starseeker
Date: 2010-09-14 00:21:18 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Hopefully, we don't need to set the project specific names anymore. May still
end up with third part makefile settings left over, but as long as the ones
actually used by BRL-CAD building are handled we should be OK.
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-09-14 00:12:05 UTC
(rev 40557)
+++ brlcad/branches/cmake/misc/CMake/ThirdParty.cmake 2010-09-14 00:21:18 UTC
(rev 40558)
@@ -16,19 +16,14 @@
ELSE(EXISTS
${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
INCLUDE(${CMAKE_ROOT}/Modules/Find${upper}.cmake)
ENDIF(EXISTS
${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${upper}.cmake)
- IF(${upper}_FOUND)
- SET(${CMAKE_PROJECT_NAME}_${upper}_INCLUDE_DIR
${${upper}_INCLUDE_DIR} CACHE STRING "set by THIRD_PARTY macro" FORCE)
- SET(${CMAKE_PROJECT_NAME}_${upper}_LIBRARY
${${upper}_LIBRARY} CACHE STRING "set by THIRD_PARTY macro" FORCE)
- ELSE(${upper}_FOUND)
+ IF(NOT ${upper}_FOUND)
IF(NOT ${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
SET(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper}
ON CACHE BOOL "Build the local ${upper} library." FORCE)
SET(${upper}_LIBRARY "${lower}" CACHE STRING
"set by THIRD_PARTY macro" FORCE)
- SET(${CMAKE_PROJECT_NAME}_${upper}_LIBRARY
${${upper}_LIBRARY} CACHE STRING "set by THIRD_PARTY macro" FORCE)
ENDIF(NOT ${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
- ENDIF(${upper}_FOUND)
+ ENDIF(NOT ${upper}_FOUND)
ELSE(NOT ${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OR
${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
SET(${upper}_LIBRARY "${lower}" CACHE STRING "set by
THIRD_PARTY macro" FORCE)
- SET(${CMAKE_PROJECT_NAME}_${upper}_LIBRARY ${${upper}_LIBRARY} CACHE
STRING "set by THIRD_PARTY macro" FORCE)
ENDIF(NOT ${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} OR
${CMAKE_PROJECT_NAME}_SYSTEM_LIBS_ONLY)
MARK_AS_ADVANCED(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper})
ENDMACRO(THIRD_PARTY_OPTION)
@@ -38,7 +33,6 @@
IF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}_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(${CMAKE_PROJECT_NAME}_${upper}_INCLUDE_DIR
${${upper}_INCLUDE_DIR} CACHE STRING "set by THIRD_PARTY_SUBDIR macro" FORCE)
ENDIF(${CMAKE_PROJECT_NAME}_BUILD_LOCAL_${upper} AND NOT
${CMAKE_PROJECT_NAME}_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.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
