Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake Install: Capitalization fixes for config.cmake file #2693

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CMake Install: Capitalization fixes for config.cmake file #2693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cmake/install-package-config-files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
#
function(osgearth_package_install_config_files INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR)

set(PACKAGE_INSTALL_DIR share/osgearth)
set(PACKAGE_INSTALL_DIR share/osgEarth)

include(CMakePackageConfigHelpers)

configure_package_config_file(
"${PROJECT_SOURCE_DIR}/cmake/osgEarth-config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/osgEarth-config.cmake"
"${PROJECT_SOURCE_DIR}/cmake/osgearth-config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/osgearth-config.cmake"
INSTALL_DESTINATION ${PACKAGE_INSTALL_DIR}
PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR)

write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/osgEarth-configVersion.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/osgearth-config-version.cmake"
VERSION ${OSGEARTH_VERSION}
COMPATIBILITY AnyNewerVersion)

install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/osgEarth-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/osgEarth-configVersion.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/osgearth-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/osgearth-config-version.cmake"
DESTINATION
${PACKAGE_INSTALL_DIR} )

Expand All @@ -37,7 +37,7 @@ endfunction()
#
function(osgearth_package_install_library_target MY_TARGET)

set(PACKAGE_INSTALL_DIR share/osgearth)
set(PACKAGE_INSTALL_DIR share/osgEarth)

install(
EXPORT ${MY_TARGET}Targets
Expand Down
5 changes: 4 additions & 1 deletion cmake/osgEarth-config.cmake.in → cmake/osgearth-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# osgEarth_INCLUDE_DIR : include root
# osgEarth_SHARE_DIR : location of share folder containing cmake files and external resources
#
cmake_minimum_required(VERSION 3.10.0)
cmake_minimum_required(VERSION 3.11.0)

@PACKAGE_INIT@

Expand All @@ -37,6 +37,9 @@ find_dependency(OpenSceneGraph REQUIRED COMPONENTS osg osgDB osgGA osgUtil osgVi
foreach(MY_DEPENDENCY @OSGEARTH_PUBLIC_DEPENDENCIES@)
find_dependency(${MY_DEPENDENCY} REQUIRED)
endforeach()
if(UNIX)
find_dependency(Threads REQUIRED)
endif()

# include the target for each library in OSGEARTH_COMPONENTS:
foreach(MY_COMPONENT @OSGEARTH_COMPONENTS@)
Expand Down
Loading