Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Libtk reorganization #4

Closed
wants to merge 5 commits into from
Closed

Libtk reorganization #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0d8565
"Start reorganizing the build files for libtk205."
May 10, 2023
99729ef
Manual merge from branch that was created in toolkit repo.
tanaya-mankad May 16, 2023
663328f
Merge courierr submodule from prior branch.
tanaya-mankad May 16, 2023
c011830
Update include paths.
tanaya-mankad May 16, 2023
904d262
Update btwxt.
tanaya-mankad Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build/
.vscode/
__pycache__/
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "vendor/btwxt"]
path = vendor/btwxt
url = https://github.com/bigladder/btwxt.git
[submodule "vendor/courierr"]
path = vendor/courierr
url = https://github.com/bigladder/courierr.git
14 changes: 8 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,22 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
"MinSizeRel" "RelWithDebInfo")
endif()

find_package(Git QUIET)

include(CTest)
set(JSON_BuildTests OFF CACHE INTERNAL "")
option( LIBTK205_BUILD_TESTING "Build libtk205 testing targets." ON )

option(${PROJECT_NAME}_BUILD_TESTING "Build ${PROJECT_NAME} testing targets" OFF)
option(${PROJECT_NAME}_COVERAGE "Add ${PROJECT_NAME} coverage reports" OFF)

set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
include(compiler-flags)

add_subdirectory(src)
add_subdirectory(vendor)

if (LIBTK205_BUILD_TESTING)
if (${PROJECT_NAME}_BUILD_TESTING)
add_compile_definitions(TEST205_INPUT_EXAMPLES_DIR="${PROJECT_SOURCE_DIR}")
enable_testing()
add_subdirectory(test)
endif()

# set(CPACK_PROJECT_NAME ${PROJECT_NAME})
# set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
# include(CPack)
7 changes: 7 additions & 0 deletions cmake/compiler-flags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if (UNIX)
add_definitions("-fPIC")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
endif()

2 changes: 1 addition & 1 deletion examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AA.RS0001.a205.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"schema_version": "1.0.0",
"description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'AA': 225.0 ton, 2.23 COP liquid-cooled, centrifugal compressor chiller",
"id": "0d92de87-13de-4fa4-a6f5-c092ded36fa1",
"data_timestamp": "2022-12-01T11:35Z",
"data_timestamp": "2022-12-20T09:13Z",
"data_version": 1,
"data_source": "https://github.com/bigladder/chiller",
"disclaimer": "This data is synthetic and does not represent any physical products.",
Expand Down
Loading
Loading