Skip to content

Commit

Permalink
missed some capitalization changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanmrichard committed Dec 15, 2023
1 parent d6b449a commit 7a8154d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmake/cmaize/globals.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ cpp_set_global(
#]]
cpp_set_global(
CMAIZE_SUPPORTED_PACKAGE_MANAGERS
CMake
cmake
)
2 changes: 1 addition & 1 deletion cmake/cmaize/package_managers/cmake/impl_/ctor.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ macro(_cpm_ctor_impl self)
include(GNUInstallDirs)
endif()

PackageManager(SET "${self}" type "CMake")
PackageManager(SET "${self}" type "cmake")

# Establish default paths
if(CMAKE_INSTALL_LIBDIR)
Expand Down
8 changes: 4 additions & 4 deletions cmake/cmaize/user_api/add_package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ function(cmaize_add_package _cap_tgt_name)
cmake_parse_arguments(_cap "" "${_cap_one_value_args}" "" ${ARGN})

if("${_cap_PACKAGE_MANAGER}" STREQUAL "")
set(_cap_PACKAGE_MANAGER "CMake")
set(_cap_PACKAGE_MANAGER "cmake")
endif()

string(TOLOWER "${_cap_PACKAGE_MANAGER}" _cap_pm_lower)
if("${_cap_pm_lower}" STREQUAL "cmake")
cmaize_add_package_cmake("${_cap_tgt_name}" ${_cap_UNPARSED_ARGUMENTS})
else()
cpp_raise(
InvalidPackageManager
InvalidPackageManager
"Invalid package manager: ${_cap_PACKAGE_MANAGER}"
)
endif()
Expand All @@ -65,14 +65,14 @@ function(cmaize_add_package_cmake _capc_pkg_name)

# Get the correct package manager
CMaizeProject(get_package_manager
"${_capc_proj}" _capc_pm_obj "CMake"
"${_capc_proj}" _capc_pm_obj "cmake"
)

# TODO: This probably can be eliminated if CMaizeProject(get_package_manager
# uses get_package_manager_instance under the hood
# Create new package manager if it doesn't exist
if("${_capc_pm_obj}" STREQUAL "")
get_package_manager_instance(_capc_pm_obj "CMake")
get_package_manager_instance(_capc_pm_obj "cmake")
CMaizeProject(add_package_manager "${_capc_proj}" "${_capc_pm_obj}")
endif()

Expand Down
5 changes: 5 additions & 0 deletions cmake/cmaize/user_api/find_or_build_dependency.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ function(cmaize_find_or_build_dependency _fobd_name)
set(foo "bar")
elseif("${_fobd_PACKAGE_MANAGER}" STREQUAL "pip")
enable_pip_package_manager()
else()
cpp_raise(
UNKNOWN_PM
"Package manager ${_fobd_PACKAGE_MANAGER} was not registered."
)
endif()

CMaizeProject(get_package_manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function("${test_cmake_package_manager}")
ct_add_section(NAME "type_is_cmake")
function("${type_is_cmake}")

set(corr "CMake")
set(corr "cmake")

CMakePackageManager(CTOR pm_obj)

Expand Down

0 comments on commit 7a8154d

Please sign in to comment.