Remove unnecessary project() calls

project() should only be called if the subdirectory, in fact, can be
built standalone.
This commit is contained in:
2024-11-18 15:42:37 +01:00
parent e1b8bbf12d
commit ca9ef16d0d
13 changed files with 57 additions and 72 deletions

View File

@@ -36,25 +36,23 @@
### DRAMSys::config ###
########################################
project(DRAMSys_Configuration)
add_library(${PROJECT_NAME}
add_library(configuration
DRAMSys/config/DRAMSysConfiguration.cpp
DRAMSys/config/memspec/MemArchitectureSpec.cpp
DRAMSys/config/memspec/MemPowerSpec.cpp
DRAMSys/config/memspec/MemTimingSpec.cpp
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(configuration PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME}
target_link_libraries(configuration
PUBLIC
nlohmann_json::nlohmann_json
)
target_compile_definitions(${PROJECT_NAME}
target_compile_definitions(configuration
PUBLIC
DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
)
add_library(DRAMSys::config ALIAS ${PROJECT_NAME})
add_library(DRAMSys::config ALIAS configuration)

View File

@@ -36,9 +36,7 @@
### DRAMSys::libdramsys ###
########################################
project(DRAMSys_libdramsys)
add_library(${PROJECT_NAME}
add_library(libdramsys
DRAMSys/common/DebugManager.cpp
DRAMSys/common/TlmRecorder.cpp
DRAMSys/common/dramExtensions.cpp
@@ -96,20 +94,20 @@ add_library(${PROJECT_NAME}
DRAMSys/simulation/SimConfig.cpp
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME}
target_link_libraries(libdramsys
PUBLIC
SystemC::systemc
DRAMSys::config
SQLite::SQLite3
)
target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
target_compile_features(libdramsys PUBLIC cxx_std_17)
if (DRAMSYS_WITH_DRAMPOWER)
target_link_libraries(${PROJECT_NAME} PUBLIC DRAMPower)
target_compile_definitions(${PROJECT_NAME} PUBLIC DRAMPOWER)
target_link_libraries(libdramsys PUBLIC DRAMPower)
target_compile_definitions(libdramsys PUBLIC DRAMPOWER)
endif ()
add_library(DRAMSys::libdramsys ALIAS ${PROJECT_NAME})
add_library(DRAMSys::libdramsys ALIAS libdramsys)

View File

@@ -38,11 +38,9 @@
### DRAMSys::simulator ###
########################################
project(DRAMSys_Simulator)
find_package(Threads)
add_library(${PROJECT_NAME}
add_library(simulator
simulator/Cache.cpp
simulator/EccModule.cpp
simulator/MemoryManager.cpp
@@ -56,15 +54,15 @@ add_library(${PROJECT_NAME}
simulator/util.cpp
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(simulator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME}
target_link_libraries(simulator
PUBLIC
Threads::Threads
DRAMSys::libdramsys
libdramsys
)
add_library(DRAMSys::simulator ALIAS ${PROJECT_NAME})
add_library(DRAMSys::simulator ALIAS simulator)
add_executable(DRAMSys
main.cpp
@@ -72,5 +70,5 @@ add_executable(DRAMSys
target_link_libraries(DRAMSys
PRIVATE
DRAMSys_Simulator
simulator
)

View File

@@ -38,8 +38,6 @@
### TraceAnalyzer ###
########################################
project(TraceAnalyzer)
# Add Python3 Dependency:
find_package(Python3 COMPONENTS Development Interpreter)
@@ -115,7 +113,7 @@ target_link_libraries(TraceAnalyzer
set(DRAMSYS_TRACE_ANALYZER_EXTENSION_DIR "${CMAKE_SOURCE_DIR}/extensions/apps/traceAnalyzer")
target_compile_definitions(${PROJECT_NAME}
target_compile_definitions(TraceAnalyzer
PRIVATE
DRAMSYS_TRACE_ANALYZER_EXTENSION_DIR="${DRAMSYS_TRACE_ANALYZER_EXTENSION_DIR}"
)