From 1f800cceff01f09af7405f35c11321d79f9a36b6 Mon Sep 17 00:00:00 2001 From: Glenn Waldron Date: Fri, 17 May 2024 10:53:37 -0400 Subject: [PATCH] CMake: add missing BUildConfig and Version headers in the install --- src/osgEarth/CMakeLists.txt | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt index d0d6a81b63..b8adeaafa6 100644 --- a/src/osgEarth/CMakeLists.txt +++ b/src/osgEarth/CMakeLists.txt @@ -841,9 +841,21 @@ endif() message(STATUS "Building ${LIB_NAME} as a ${OSGEARTH_DYNAMIC_OR_STATIC} library") +# Generate the Version header. +set(OSGEARTH_VERSION_HEADER "${OSGEARTH_BUILDTIME_INCLUDE_DIR}/osgEarth/Version") +message(STATUS "Creating ${OSGEARTH_VERSION_HEADER}") +configure_file(Version.in ${OSGEARTH_VERSION_HEADER}) + +# Generate the BuildConfig header. +set(OSGEARTH_BUILDCONFIG_HEADER "${OSGEARTH_BUILDTIME_INCLUDE_DIR}/osgEarth/BuildConfig") +message(STATUS "Creating ${OSGEARTH_BUILDCONFIG_HEADER}") +configure_file(BuildConfig.in ${OSGEARTH_BUILDCONFIG_HEADER}) + + + add_osgearth_library( TARGET ${LIB_NAME} - PUBLIC_HEADERS ${TARGET_H} + PUBLIC_HEADERS ${TARGET_H} ${OSGEARTH_VERSION_HEADER} ${OSGEARTH_BUILDCONFIG_HEADER} IMGUI_HEADERS ${TARGET_H_IMGUI} SOURCES ${TARGET_SRC} SHADERS ${TARGET_GLSL} @@ -938,17 +950,3 @@ else() ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ${TIFF_LIBRARY} ${PROJ4_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY}) endif() - - -# Files generated from templates .................................. - -# Generate the Version header. -set(OSGEARTH_VERSION_HEADER "${OSGEARTH_BUILDTIME_INCLUDE_DIR}/osgEarth/Version") -message(STATUS "Creating ${OSGEARTH_VERSION_HEADER}") -configure_file(Version.in ${OSGEARTH_VERSION_HEADER}) - -# Generate the BuildConfig header. -set(OSGEARTH_BUILDCONFIG_HEADER "${OSGEARTH_BUILDTIME_INCLUDE_DIR}/osgEarth/BuildConfig") -message(STATUS "Creating ${OSGEARTH_BUILDCONFIG_HEADER}") -configure_file(BuildConfig.in ${OSGEARTH_BUILDCONFIG_HEADER}) -