Browse Source

CMake: Rearrange root CMakeLists; some includes may depend on dtool config.

Sam Edwards 12 years ago
parent
commit
6e0dc789b6
1 changed files with 8 additions and 6 deletions
  1. 8 6
      CMakeLists.txt

+ 8 - 6
CMakeLists.txt

@@ -9,22 +9,24 @@ enable_testing()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/macros/")
 
+# Include global modules needed for configure scripts
+include(PackageConfig)      # Defines package_option AND target_use_packages
+
+# Configure Panda3D
+include(dtool/PandaVersion.cmake)
+include(dtool/Package.cmake)
+include(dtool/Config.cmake)
+
 # Include global modules
 include(AutoInclude)        # Implements automatic include_directories finding
 include(AddBisonTarget)     # Defines add_bison_target function
 include(AddFlexTarget)      # Defines add_flex_target function
 include(CompositeSources)   # Defines composite_sources function
-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")
 
-# Configure Panda3D
-include(dtool/PandaVersion.cmake)
-include(dtool/Package.cmake)
-include(dtool/Config.cmake)
-
 # Determine which trees to build.
 option(BUILD_DTOOL "Build the dtool source tree." ON)
 option(BUILD_PANDA "Build the panda source tree." ON)