Skip to content

Commit

Permalink
using new version string
Browse files Browse the repository at this point in the history
  • Loading branch information
mhekkel committed Aug 16, 2023
1 parent a45ae89 commit dd2b939
Show file tree
Hide file tree
Showing 4 changed files with 349 additions and 42 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build/
src/revision.hpp
src/mrsrc.hpp
.vscode/
energyd.conf
10 changes: 4 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 3.16)

# set the project name
project(energyd VERSION 2.0.0 LANGUAGES CXX)
project(energyd VERSION 2.0.1 LANGUAGES CXX)

include(FindPkgConfig)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

set(CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
Expand All @@ -34,12 +34,10 @@ mrc_write_header(${PROJECT_SOURCE_DIR}/src/mrsrc.hpp)
# Libraries
find_package(zeep 6 REQUIRED)
find_package(libmcfp REQUIRED)

set(ENV{PKG_CONFIG_PATH} "$ENV{HOME}/.local/lib/pkgconfig/")
pkg_check_modules(PKG_PQ libpqxx>=7.2 libpq IMPORTED_TARGET REQUIRED)
find_package(libpqxx 7.8 REQUIRED)

add_executable(energyd ${PROJECT_SOURCE_DIR}/src/energyd.cpp)
target_link_libraries(energyd PkgConfig::PKG_PQ libmcfp::libmcfp zeep::zeep)
target_link_libraries(energyd libpqxx::pqxx libmcfp::libmcfp zeep::zeep)

# yarn rules for javascripts

Expand Down
Loading

0 comments on commit dd2b939

Please sign in to comment.