From 363090fddb0261dd03f03b4d8e5c52f1040de025 Mon Sep 17 00:00:00 2001 From: Phillip Date: Fri, 13 Nov 2015 23:37:20 -0800 Subject: [PATCH] Cache paths --- hecl/CMakeLists.txt | 6 +++--- hecl/extern/CMakeLists.txt | 5 ----- hecl/extern/libBoo | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hecl/CMakeLists.txt b/hecl/CMakeLists.txt index ebba17c3c..471752112 100644 --- a/hecl/CMakeLists.txt +++ b/hecl/CMakeLists.txt @@ -12,14 +12,14 @@ endif() configure_file(DataSpecRegistry.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/DataSpecRegistry.hpp @ONLY) list(APPEND HECL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/blender) -set(HECL_INCLUDE_DIR ${HECL_INCLUDE_DIR} PARENT_SCOPE) +set(HECL_INCLUDE_DIR ${HECL_INCLUDE_DIR} CACHE PATH "HECL include path" FORCE) set(ATHENA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/Athena/include) set(ATHENA_INCLUDE_DIR ${ATHENA_INCLUDE_DIR} PARENT_SCOPE) -set(LOG_VISOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/LogVisor/include) -set(LOG_VISOR_INCLUDE_DIR ${LOG_VISOR_INCLUDE_DIR} PARENT_SCOPE) set(SQUISH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/libSquish) set(SQUISH_INCLUDE_DIR ${SQUISH_INCLUDE_DIR} PARENT_SCOPE) + set(BOO_INCLUDE_DIR extern/libBoo/include) + add_subdirectory(bintoc) add_subdirectory(extern) include_directories(include ${LOG_VISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR} ${BOO_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) diff --git a/hecl/extern/CMakeLists.txt b/hecl/extern/CMakeLists.txt index b72ae7750..884466e44 100644 --- a/hecl/extern/CMakeLists.txt +++ b/hecl/extern/CMakeLists.txt @@ -1,9 +1,4 @@ -#disable libBoo for FreeBSD for the time being -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") add_subdirectory(libBoo) -set(BOO_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libBoo/include) -endif() - add_subdirectory(libSquish) add_subdirectory(xxhash) add_subdirectory(Athena) diff --git a/hecl/extern/libBoo b/hecl/extern/libBoo index fe061b8d0..ddcbc102b 160000 --- a/hecl/extern/libBoo +++ b/hecl/extern/libBoo @@ -1 +1 @@ -Subproject commit fe061b8d0a393e4a68d084503872b551e08ac91c +Subproject commit ddcbc102bab8cda86c0d93a859f6e2c1d8db0bd7