Skip to content
Snippets Groups Projects
Commit 6b3636c1 authored by Grégoire Kubler's avatar Grégoire Kubler
Browse files

chore : cleanup

parent 8d01f6f1
No related branches found
No related tags found
2 merge requests!93Release v0.3.0,!64Feat/release pip
Pipeline #48181 waiting for manual action
...@@ -5,7 +5,7 @@ file(STRINGS "${CMAKE_SOURCE_DIR}/version.txt" version) ...@@ -5,7 +5,7 @@ file(STRINGS "${CMAKE_SOURCE_DIR}/version.txt" version)
project(aidge_backend_cpu project(aidge_backend_cpu
VERSION ${version} VERSION ${version}
DESCRIPTION "CPU implementations of the operators of aidge framework" DESCRIPTION "CPU implementations of the operators of aidge framework."
LANGUAGES CXX) LANGUAGES CXX)
message(STATUS "Project name: ${CMAKE_PROJECT_NAME}") message(STATUS "Project name: ${CMAKE_PROJECT_NAME}")
...@@ -22,7 +22,7 @@ execute_process( ...@@ -22,7 +22,7 @@ execute_process(
message(STATUS "Latest git commit: ${GIT_COMMIT_HASH}") message(STATUS "Latest git commit: ${GIT_COMMIT_HASH}")
add_definitions(-DGIT_COMMIT_HASH="${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 set(module_name _${CMAKE_PROJECT_NAME}) # target name
############################################## ##############################################
...@@ -57,11 +57,8 @@ find_package(aidge_core REQUIRED) ...@@ -57,11 +57,8 @@ find_package(aidge_core REQUIRED)
file(GLOB_RECURSE src_files "src/*.cpp") file(GLOB_RECURSE src_files "src/*.cpp")
file(GLOB_RECURSE inc_files "include/*.hpp") file(GLOB_RECURSE inc_files "include/*.hpp")
##############################################
# creating library
add_library(${module_name} ${src_files} ${inc_files}) add_library(${module_name} ${src_files} ${inc_files})
target_link_libraries(${module_name} target_link_libraries(${module_name}
PUBLIC PUBLIC
_aidge_core # _ is added because we link the exported target and not the project _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 ...@@ -129,11 +126,9 @@ install(TARGETS ${module_name} EXPORT ${CMAKE_PROJECT_NAME}-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
) )
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
#Export the targets to a script #Export the targets to a script
install(EXPORT ${CMAKE_PROJECT_NAME}-targets install(EXPORT ${CMAKE_PROJECT_NAME}-targets
FILE "${CMAKE_PROJECT_NAME}-targets.cmake" FILE "${CMAKE_PROJECT_NAME}-targets.cmake"
DESTINATION ${INSTALL_CONFIGDIR} DESTINATION ${INSTALL_CONFIGDIR}
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
import sys import sys
import os import os
import shutil import shutil
import pathlib import pathlib
import multiprocessing import multiprocessing
...@@ -11,8 +10,6 @@ import toml ...@@ -11,8 +10,6 @@ import toml
from math import ceil from math import ceil
import toml
from setuptools import setup, Extension from setuptools import setup, Extension
from setuptools.command.build_ext import build_ext from setuptools.command.build_ext import build_ext
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment