OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #205 from rolk/205_tinyxml

Browse Source 
Dependent packages fail if opm-core uses embedded TinyXML
This commit is contained in:
Atgeirr Flø Rasmussen 2013-03-18 05:12:20 -07:00
commit e59db97128
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/Modules/OpmPackage.cmake
View File

@ -136,6 +136,13 @@ macro (find_opm_package module deps header lib defs prog conf)
list (APPEND _deps ${_name_only})
endforeach (_dep)
# since find_and_append_package_to is a macro, this variable have
# probably been overwritten (due to its common name); it is now
# this module's last dependency instead of the name of the module
# itself, so it must be restored
string (TOUPPER ${module} MODULE_UPPER)
string (REPLACE "-" "_" MODULE ${MODULE_UPPER})
# compile with this option to avoid avalanche of warnings
set (${module}_DEFINITIONS "${${module}_DEFINITIONS}")
foreach (_def IN ITEMS ${defs})