[brlcad-commits] SF.net SVN: brlcad:[47799] brlcad/trunk/misc/CMake/ThirdParty.cmake
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2011-12-06 18:08:11
|
Revision: 47799 http://brlcad.svn.sourceforge.net/brlcad/?rev=47799&view=rev Author: starseeker Date: 2011-12-06 18:08:04 +0000 (Tue, 06 Dec 2011) Log Message: ----------- go full path on src/other executables, since if we're trying to build bundled and there is a system version of the exec present in path, the target name will end up calling the system binary when it trys to run. Modified Paths: -------------- brlcad/trunk/misc/CMake/ThirdParty.cmake Modified: brlcad/trunk/misc/CMake/ThirdParty.cmake =================================================================== --- brlcad/trunk/misc/CMake/ThirdParty.cmake 2011-12-06 17:54:14 UTC (rev 47798) +++ brlcad/trunk/misc/CMake/ThirdParty.cmake 2011-12-06 18:08:04 UTC (rev 47799) @@ -203,7 +203,7 @@ # turn it on SET(${CMAKE_PROJECT_NAME}_${upper}_BUILD ON) - SET(${upper}_EXECUTABLE "${lower}" CACHE STRING "set by THIRD_PARTY macro" FORCE) + SET(${upper}_EXECUTABLE "${CMAKE_BINARY_DIR}/${BIN_DIR}/${lower}" CACHE STRING "set by THIRD_PARTY macro" FORCE) ELSE(${CMAKE_PROJECT_NAME}_${upper} MATCHES "BUNDLED") @@ -250,7 +250,7 @@ # turn it on, didn't find it SET(${CMAKE_PROJECT_NAME}_${upper}_BUILD ON) - SET(${upper}_EXECUTABLE "${lower}" CACHE STRING "set by THIRD_PARTY macro" FORCE) + SET(${upper}_EXECUTABLE "${CMAKE_BINARY_DIR}/${BIN_DIR}/${lower}" CACHE STRING "set by THIRD_PARTY macro" FORCE) # did NOT find system-installed 3rd-party dep IF(${CMAKE_PROJECT_NAME}_${upper} MATCHES "AUTO") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |