CMake output lib/exe fixes (#244)
* Fixes #167 * No need to make app/ directory, it's already there * Put lib/exe only in build dir, update docs and other references accordingly * Remove gitignore stuff * Bump CMake version too * Minor correction to be more exact * Update regression_vars.tcl * Requested txt fixes * Update date
This commit is contained in:
parent
ac02981b62
commit
c416229106
|
|
@ -15,11 +15,6 @@ cmake-build-debug
|
||||||
build
|
build
|
||||||
pvt
|
pvt
|
||||||
|
|
||||||
app/sta
|
|
||||||
app/libOpenSTA.*
|
|
||||||
app/sta.exe
|
|
||||||
app/sta.dSYM
|
|
||||||
|
|
||||||
# iverilog turd
|
# iverilog turd
|
||||||
examples/gcd_tb
|
examples/gcd_tb
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
|
||||||
cmake_policy(SET CMP0086 NEW)
|
cmake_policy(SET CMP0086 NEW)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
project(STA VERSION 2.6.2
|
project(STA VERSION 2.7.0
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -471,9 +471,6 @@ target_include_directories(sta_swig
|
||||||
# Library
|
# Library
|
||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
# compatibility with configure
|
|
||||||
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${STA_HOME}/app)
|
|
||||||
|
|
||||||
add_library(OpenSTA)
|
add_library(OpenSTA)
|
||||||
|
|
||||||
target_sources(OpenSTA
|
target_sources(OpenSTA
|
||||||
|
|
@ -553,13 +550,12 @@ target_compile_options(OpenSTA
|
||||||
set_target_properties(OpenSTA PROPERTIES CXX_EXTENSIONS OFF)
|
set_target_properties(OpenSTA PROPERTIES CXX_EXTENSIONS OFF)
|
||||||
target_compile_features(OpenSTA PUBLIC cxx_std_17)
|
target_compile_features(OpenSTA PUBLIC cxx_std_17)
|
||||||
|
|
||||||
|
message(STATUS "STA library: ${CMAKE_BINARY_DIR}/libOpenSTA.a")
|
||||||
|
|
||||||
###########################################################
|
###########################################################
|
||||||
# Executable
|
# Executable
|
||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
# compatibility with configure
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${STA_HOME}/app)
|
|
||||||
|
|
||||||
# Note executable and lib name cannot be the same because
|
# Note executable and lib name cannot be the same because
|
||||||
# on osx something is case insensitive. Using STA for the
|
# on osx something is case insensitive. Using STA for the
|
||||||
# lib name results in "No rule to make target ../depend.
|
# lib name results in "No rule to make target ../depend.
|
||||||
|
|
@ -570,7 +566,7 @@ target_link_libraries(sta
|
||||||
OpenSTA
|
OpenSTA
|
||||||
)
|
)
|
||||||
|
|
||||||
message(STATUS "STA executable: ${STA_HOME}/app/sta")
|
message(STATUS "STA executable: ${CMAKE_BINARY_DIR}/sta")
|
||||||
|
|
||||||
################################################################
|
################################################################
|
||||||
# Install
|
# Install
|
||||||
|
|
|
||||||
|
|
@ -64,4 +64,4 @@ RUN source /opt/rh/devtoolset-11/enable && \
|
||||||
make -j`nproc`
|
make -j`nproc`
|
||||||
|
|
||||||
# Run sta on entry
|
# Run sta on entry
|
||||||
ENTRYPOINT ["/OpenSTA/app/sta"]
|
ENTRYPOINT ["/OpenSTA/build/sta"]
|
||||||
|
|
|
||||||
|
|
@ -40,4 +40,4 @@ RUN cd OpenSTA && \
|
||||||
make -j`nproc`
|
make -j`nproc`
|
||||||
|
|
||||||
# Run sta on entry
|
# Run sta on entry
|
||||||
ENTRYPOINT ["OpenSTA/app/sta"]
|
ENTRYPOINT ["OpenSTA/build/sta"]
|
||||||
|
|
|
||||||
|
|
@ -157,8 +157,8 @@ cmake -DCUDD_DIR=<CUDD_INSTALL_DIR> ,.
|
||||||
make
|
make
|
||||||
```
|
```
|
||||||
The default build type is release to compile optimized code.
|
The default build type is release to compile optimized code.
|
||||||
The resulting executable is in `app/sta`.
|
The resulting executable is in `build/sta`.
|
||||||
The library without a `main()` procedure is `app/libSTA.a`.
|
The library without a `main()` procedure is `build/libOpenSTA.a`.
|
||||||
|
|
||||||
Optional CMake variables passed as -D<var>=<value> arguments to CMake are show below.
|
Optional CMake variables passed as -D<var>=<value> arguments to CMake are show below.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
This file summarizes STA API changes for each release.
|
This file summarizes STA API changes for each release.
|
||||||
|
|
||||||
Release 2.6.2 2024/03/30
|
Release 2.6.2 2025/03/30
|
||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
The following functions have been renamed to to_string and return std::string
|
The following functions have been renamed to to_string and return std::string
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,13 @@ OpenSTA Timing Analyzer Release Notes
|
||||||
|
|
||||||
This file summarizes user visible changes for each release.
|
This file summarizes user visible changes for each release.
|
||||||
|
|
||||||
Realase 2.6.1 2025/03/30
|
Release 2.7.0 2025/05/19
|
||||||
|
-------------------------
|
||||||
|
|
||||||
|
The OpenSTA library `libOpenSTA` and `sta` executable are now built in the
|
||||||
|
build directory instead of `app/`.
|
||||||
|
|
||||||
|
Release 2.6.1 2025/03/30
|
||||||
-------------------------
|
-------------------------
|
||||||
|
|
||||||
The -list_annotated and -list_not_annotated arguments to the
|
The -list_annotated and -list_not_annotated arguments to the
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
# Application program to run tests on.
|
# Application program to run tests on.
|
||||||
set app "sta"
|
set app "sta"
|
||||||
set sta_dir [file dirname $test_dir]
|
set sta_dir [file dirname $test_dir]
|
||||||
set app_path [file join $sta_dir "app" $app]
|
set app_path [file join $sta_dir "build" $app]
|
||||||
# Application options.
|
# Application options.
|
||||||
set app_options "-no_init -no_splash -exit"
|
set app_options "-no_init -no_splash -exit"
|
||||||
# Log files for each test are placed in result_dir.
|
# Log files for each test are placed in result_dir.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue