Including TribitsPackageMacros at base level

This way you don't need to have a package include this CMake file. This is also a protection in that if someone accidentally tries to run CMkae configure on a package directory, they will get errors. Someone actually tried to do this once.
TriBITSPub · Feb 21, 2014 · 00e4179 · 00e4179
1 parent 8cfbbac
commit 00e4179
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/doc/examples/TribitsHelloWorld/hello_world/CMakeLists.txt b/doc/examples/TribitsHelloWorld/hello_world/CMakeLists.txt
@@ -1,4 +1,3 @@
-INCLUDE(TribitsPackageMacros)
 TRIBITS_PACKAGE(HelloWorld)
 
 TRIBITS_ADD_LIBRARY(hello_world_lib

diff --git a/package_arch/TribitsGlobalMacros.cmake b/package_arch/TribitsGlobalMacros.cmake
@@ -1842,6 +1842,8 @@ MACRO(TRIBITS_CONFIGURE_ENABLED_PACKAGES)
 
   SET(CONFIGURED_A_PACKAGE FALSE)
   SET(ENABLED_PACKAGE_LIBS_TARGETS)
+
+  INCLUDE(TribitsPackageMacros)
 
   SET(PACKAGE_IDX 0)
   FOREACH(TRIBITS_PACKAGE ${${PROJECT_NAME}_PACKAGES})