From 82854ac1e8f61bc0faeeef86df9682ae5547fd09 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Wed, 29 Jan 2014 10:41:01 -0700 Subject: [PATCH] Under CMake, generate dtool_config.h into build/include/ instead of build/ and use build/include/ as the global include directory. --- CMakeLists.txt | 2 +- dtool/LocalSetup.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1d33035dd..d7e0799c7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ include(PackageConfig) # Defines package_option AND target_use_packages include(Interrogate) # Defines target_interrogate AND add_python_module # Add the include path for source and header files generated by CMake -include_directories("${CMAKE_BINARY_DIR}") +include_directories("${CMAKE_BINARY_DIR}/include") # Configure Panda3D include(dtool/PandaVersion.cmake) diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index 978c79073b..009a45939f 100644 --- a/dtool/LocalSetup.cmake +++ b/dtool/LocalSetup.cmake @@ -212,6 +212,6 @@ endif() message("See dtool_config.h for more details about the specified configuration.") # Generate dtool_config.h -configure_file(dtool_config.h.in "${PROJECT_BINARY_DIR}/dtool_config.h") -include_directories("${PROJECT_BINARY_DIR}") +configure_file(dtool_config.h.in "${PROJECT_BINARY_DIR}/include/dtool_config.h") +include_directories("${PROJECT_BINARY_DIR}/include") #install(FILES "${PROJECT_BINARY_DIR}/dtool_config.h" DESTINATION include/panda3d)