Skip to content

Commit

Permalink
Added ChemicalFun library (#31)
Browse files Browse the repository at this point in the history
* Moved implementation to ChemicalFun

* chemicalfun to environment file

* fix link to chemicalfun

* fix forward declaration

* fix for MSVC build

* disabled build on mingw, issue with linking to chemicalfun which is compiled with MSVC

* v0.3.9

Co-authored-by: svetad <sv.dmytr@gmail.com>
Co-authored-by: G. Dan Miron <dan.miron@psi.com>
  • Loading branch information
3 people committed Jan 13, 2022
1 parent 7e11815 commit 6a4c7c3
Show file tree
Hide file tree
Showing 21 changed files with 155 additions and 1,368 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cmake_minimum_required(VERSION 3.9)

# Set the name of the project
project(ThermoFun VERSION 0.3.8 LANGUAGES CXX)
project(ThermoFun VERSION 0.3.9 LANGUAGES CXX)

# Set the cmake module path of the project
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
Expand Down
8 changes: 6 additions & 2 deletions Resources/fun-hubclient-config-win.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jsonio" : {
"arangodb" : {
"UseArangoDBInstance" : "ArangoDBRemote",
"UseVelocypackPut" : true,
"UseVelocypackGet" : true,
Expand All @@ -25,14 +25,18 @@
"DBRootUser" : "",
"DBRootPassword" : ""
}
},
"jsonio" : {

},
"jsonui" : {
"CurrentDBConnection" : "ArangoDBRemote",
"ViewOnlyMode" : true,
"CanEdit_id" : false,
"KeepExpanded" : true,
"ShowComments" : true,
"ShowEnumNames" : true
"ShowEnumNames" : true,
"CanEditDocPages" : false
},
"common" : {
"UserHomeDirectoryPath" : "C:/",
Expand Down
8 changes: 6 additions & 2 deletions Resources/fun-hubclient-config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"jsonio" : {
"arangodb" : {
"UseArangoDBInstance" : "ArangoDBRemote",
"UseVelocypackPut" : true,
"UseVelocypackGet" : true,
Expand All @@ -25,14 +25,18 @@
"DBRootUser" : "",
"DBRootPassword" : ""
}
},
"jsonio" : {

},
"jsonui" : {
"CurrentDBConnection" : "ArangoDBRemote",
"ViewOnlyMode" : true,
"CanEdit_id" : false,
"KeepExpanded" : true,
"ShowComments" : true,
"ShowEnumNames" : true
"ShowEnumNames" : true,
"CanEditDocPages" : false
},
"common" : {
"UserHomeDirectoryPath" : "~",
Expand Down
4 changes: 4 additions & 0 deletions ThermoFun/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ add_library(ThermoFun ${HEADER_FILES} ${SOURCE_FILES})
# Add aliases for ThermoFun shared and static libraries
add_library(ThermoFun::ThermoFun ALIAS ThermoFun)

if(ChemicalFun_FOUND)
target_link_libraries(ThermoFun PUBLIC ChemicalFun::ChemicalFun)
endif()

if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
#link_directories("/usr/local/lib")
else()
Expand Down
Loading

0 comments on commit 6a4c7c3

Please sign in to comment.