From bb49883b687649f74cb03b7c9945e9e9e410c924 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Thu, 11 Apr 2024 15:58:13 -0400 Subject: [PATCH] [cmake] Avoid use of CMAKE_INSTALL_BINDIR and CMAKE_INSTALL_INCLUDEDIR --- CMakeLists.txt | 2 +- src/c2py/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e03b5e..8edbfd8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,7 @@ message(STATUS "-------- Python detection -------------") find_package(Python COMPONENTS Interpreter Development NumPy) set(c2py_all_python_flags " -I${Python_INCLUDE_DIRS} -I${Python_NumPy_INCLUDE_DIRS} -L${Python_LIBRARY_DIRS} -lpython${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}") configure_file(c2py_flags.py.in c2py_flags @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/c2py_flags DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/c2py_flags DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) # ############# # Build Project diff --git a/src/c2py/CMakeLists.txt b/src/c2py/CMakeLists.txt index 3dd1b2d..657a401 100644 --- a/src/c2py/CMakeLists.txt +++ b/src/c2py/CMakeLists.txt @@ -21,7 +21,7 @@ endif() # Install library and headers install(TARGETS c2py EXPORT c2py-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h") +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h") # ========= Additional Depdencies ==========