Browse Source

Under CMake, generate dtool_config.h into build/include/ instead of build/ and use build/include/ as the global include directory.

Sam Edwards 12 years ago
parent
commit
82854ac1e8
2 changed files with 3 additions and 3 deletions
  1. 1 1
      CMakeLists.txt
  2. 2 2
      dtool/LocalSetup.cmake

+ 1 - 1
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)

+ 2 - 2
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)