diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cf11636bd5fde8dab942fcbd8be5a8eea57461a..eef0e63bf398cffb2c15b3af56ec0bf02d6590a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ file(STRINGS "${CMAKE_SOURCE_DIR}/version.txt" version) project(aidge_backend_cpu VERSION ${version} - DESCRIPTION "CPU implementations of the operators of aidge framework" + DESCRIPTION "CPU implementations of the operators of aidge framework." LANGUAGES CXX) message(STATUS "Project name: ${CMAKE_PROJECT_NAME}") @@ -22,7 +22,7 @@ execute_process( message(STATUS "Latest git commit: ${GIT_COMMIT_HASH}") add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}") -# Note : project name is {project} and python module name is also {project} +# Note : project name is ${CMAKE_PROJECT_NAME} and python module name is also ${CMAKE_PROJECT_NAME} set(module_name _${CMAKE_PROJECT_NAME}) # target name ############################################## @@ -57,11 +57,8 @@ find_package(aidge_core REQUIRED) file(GLOB_RECURSE src_files "src/*.cpp") file(GLOB_RECURSE inc_files "include/*.hpp") -############################################## -#Â creating library add_library(${module_name} ${src_files} ${inc_files}) - target_link_libraries(${module_name} PUBLIC _aidge_core # _ is added because we link the exported target and not the project @@ -129,11 +126,9 @@ install(TARGETS ${module_name} EXPORT ${CMAKE_PROJECT_NAME}-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) - install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) #Export the targets to a script - install(EXPORT ${CMAKE_PROJECT_NAME}-targets FILE "${CMAKE_PROJECT_NAME}-targets.cmake" DESTINATION ${INSTALL_CONFIGDIR} diff --git a/setup.py b/setup.py index 11162c88154c24aae330e828201c868aaa09bf1a..555bdee73fd83a7ae8250834f0584553778f8aa3 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,6 @@ import sys import os - import shutil import pathlib import multiprocessing @@ -11,8 +10,6 @@ import toml from math import ceil -import toml - from setuptools import setup, Extension from setuptools.command.build_ext import build_ext