diff --git a/CMakeLists.txt b/CMakeLists.txt index ba9309c1c..cbbdb3690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,17 +34,27 @@ ELSE() OPTION(USE_SIMD "Use SIMD vectorization" ON) OPTION(BUILD_SHARED_LIBS "Build using shared libraries" ON) + # Define the paths to the source code and python files + SET(SRC "${CMAKE_SOURCE_DIR}/src") + SET(PY "${CMAKE_SOURCE_DIR}/swiftest") + + # Make sure paths are correct for Unix or Windows style + FILE(TO_CMAKE_PATH ${SRC} SRC) + FILE(TO_CMAKE_PATH ${PY} PY) + INCLUDE(GNUInstallDirs) IF (SKBUILD) - SET(INSTALL_BINDIR ${SKBUILD_SCRIPTS_DIR}) + SET(INSTALL_BINDIR ${SKBUILD_SCRIPTS_DIR}) SET(INSTALL_LIBDIR ${SKBUILD_DATA_DIR}/lib) SET(INSTALL_INCLUDEDIR ${SKBUILD_HEADERS_DIR}) + SET(INSTALL_PYPROJ ${SKBUILD_PLATLIB_DIR}/${SKBUILD_PROJECT_NAME}) IF (APPLE) SET(CMAKE_INSTALL_RPATH "@loader_path") ELSEIF (LINUX) SET(CMAKE_INSTALL_RPATH $ORIGIN) ENDIF () ELSE () + SET(INSTALL_PYPROJ ${PY}) SET(INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR}) SET(INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}) SET(INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}) @@ -89,9 +99,6 @@ ELSE() FIND_PACKAGE(Python COMPONENTS Interpreter Development.Module REQUIRED) - SET(SRC "${CMAKE_SOURCE_DIR}/src") - SET(PY "${CMAKE_SOURCE_DIR}/swiftest") - ##################################### # Tell how to install this executable ##################################### @@ -103,11 +110,6 @@ ELSE() SET(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Path for install") ENDIF() - - # Make sure paths are correct for Unix or Windows style - FILE(TO_CMAKE_PATH ${SRC} SRC) - FILE(TO_CMAKE_PATH ${PY} PY) - # Set the name of the swiftest library SET(SWIFTEST_LIBRARY ${SKBUILD_PROJECT_NAME}) diff --git a/swiftest/CMakeLists.txt b/swiftest/CMakeLists.txt index ae6ef5247..579634562 100644 --- a/swiftest/CMakeLists.txt +++ b/swiftest/CMakeLists.txt @@ -46,4 +46,4 @@ ENDIF () TARGET_INCLUDE_DIRECTORIES(${SWIFTEST_BINDINGS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) # Define the install locations -INSTALL(TARGETS ${SWIFTEST_BINDINGS} LIBRARY DESTINATION ${INSTALL_LIBDIR}) \ No newline at end of file +INSTALL(TARGETS ${SWIFTEST_BINDINGS} LIBRARY DESTINATION ${INSTALL_PYPROJ}) \ No newline at end of file