From 6a0270279c88cb11af50cb0dfd3d8509a5f45c76 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 25 Apr 2014 08:56:53 +0000 Subject: [PATCH] Reordered the configuiration file blocks to make it more understandable --- CMakeLists.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81f15cf89..0d9f4ac78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -594,17 +594,14 @@ ENDIF() + ################################################################################ -# Set Config file +# Set Config/OpenGL header file SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config") CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in" "${OPENSCENEGRAPH_CONFIG_HEADER}") -SET(OPENSCENEGRAPH_VERSION_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/osg/Version") -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in" - "${OPENSCENEGRAPH_VERSION_HEADER}") - SET(OPENSCENEGRAPH_OPENGL_HEADER "${PROJECT_BINARY_DIR}/include/osg/OpenGL") CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/OpenGL.in" "${OPENSCENEGRAPH_OPENGL_HEADER}") @@ -612,9 +609,17 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/OpenGL.in" # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") +################################################################################ +# Set Vertsion header file + +SET(OPENSCENEGRAPH_VERSION_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/osg/Version") +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in" + "${OPENSCENEGRAPH_VERSION_HEADER}") + ################################################################################ # Set Version Info resource file + IF(MSVC) SET(OPENSCENEGRAPH_VERSIONINFO_RC "${PROJECT_BINARY_DIR}/PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc") CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/PlatformSpecifics/Windows/OpenSceneGraphVersionInfo.rc.in"