Skip to content

Commit 6cf7fa2

Browse files
committed
[cmake] Change inconsistencies in naming and location of cmake targets file
1 parent 2fc0b9b commit 6cf7fa2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ set(LIBCLANG_LOCATION "${LIBCLANG_LOCATION}" CACHE STRING "Location of the libcl
5555

5656
find_package(Python)
5757
add_library(cpp2py::python_and_numpy ALIAS python_and_numpy)
58-
install(TARGETS python_and_numpy EXPORT cpp2py-targets)
58+
install(TARGETS python_and_numpy EXPORT Cpp2PyTargets)
5959

6060
# find_package(Python3 COMPONENTS Development Interpreter)
6161
# set(PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR})

c++/cpp2py/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ target_include_directories(cpp2py
99
)
1010

1111
# Install the library in lib and export the cpp2py target
12-
install(TARGETS cpp2py EXPORT cpp2py-targets DESTINATION lib)
12+
install(TARGETS cpp2py EXPORT Cpp2PyTargets DESTINATION lib)
1313
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" PATTERN "*.hxx")
1414

1515
# --- Python ---
@@ -19,4 +19,4 @@ target_link_libraries(cpp2py PUBLIC python_and_numpy)
1919
# ---------------
2020

2121
# Install the exported targets
22-
install(EXPORT cpp2py-targets NAMESPACE cpp2py:: DESTINATION lib/cmake/cpp2py)
22+
install(EXPORT Cpp2PyTargets NAMESPACE cpp2py:: DESTINATION lib/cmake/Cpp2Py)

cmake/Cpp2PyConfig.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ add_executable(cp_rs IMPORTED GLOBAL)
4545
set_property(TARGET cp_rs PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_PREFIX@/bin/cp_rs")
4646

4747
# include the exported targets of this project
48-
include(@CMAKE_INSTALL_PREFIX@/lib/cmake/cpp2py/cpp2py-targets.cmake)
48+
include(@CMAKE_INSTALL_PREFIX@/lib/cmake/Cpp2Py/Cpp2PyTargets.cmake)
4949

5050
###################################################################################
5151
#

0 commit comments

Comments
 (0)