Revision: 70094
http://sourceforge.net/p/brlcad/code/70094
Author: starseeker
Date: 2017-08-17 22:19:51 +0000 (Thu, 17 Aug 2017)
Log Message:
-----------
live dangerously... see what happens with a quick and dirty macro->function
conversion for THIRD_PARTY
Modified Paths:
--------------
brlcad/trunk/misc/CMake/ThirdParty.cmake
Modified: brlcad/trunk/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ThirdParty.cmake 2017-08-17 22:09:28 UTC (rev
70093)
+++ brlcad/trunk/misc/CMake/ThirdParty.cmake 2017-08-17 22:19:51 UTC (rev
70094)
@@ -53,7 +53,7 @@
# )
#-----------------------------------------------------------------------------
-macro(THIRD_PARTY dir varname_root build_target description)
+function(THIRD_PARTY dir varname_root build_target description)
# If the library variable has been explicitly set, get
# an varname_rootcase version of it for easier matching
@@ -264,6 +264,12 @@
set(${varname_root}_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${dir}"
"${CMAKE_CURRENT_BINARY_DIR}/${dir}" CACHE STRING "set by THIRD_PARTY_SUBDIR
macro" FORCE)
endif(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD)
+ # Let parent scope know what's happening
+ set(${varname_root}_LIBRARY "${${varname_root}_LIBRARY}" PARENT_SCOPE)
+ set(${varname_root}_INCLUDE_DIR "${${varname_root}_INCLUDE_DIR}"
PARENT_SCOPE)
+ set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD
${${CMAKE_PROJECT_NAME}_${varname_root}_BUILD} PARENT_SCOPE)
+ set(${CMAKE_PROJECT_NAME}_${varname_root}
"${${CMAKE_PROJECT_NAME}_${varname_root}}" PARENT_SCOPE)
+
if(NOT ${varname_root}_UNDOCUMENTED)
BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${varname_root}"
"${${CMAKE_PROJECT_NAME}_${varname_root}}"
TYPE ABS
@@ -276,7 +282,7 @@
mark_as_advanced(${varname_root}_LIBRARY)
mark_as_advanced(${varname_root}_INCLUDE_DIR)
-endmacro(THIRD_PARTY)
+endfunction(THIRD_PARTY)
#-----------------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
