Skip to content

Corrections for operating systems with case-sensitive filesystems. #264

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

Merged
jhs507 merged 5 commits into from
Mar 24, 2022
Merged

Corrections for operating systems with case-sensitive filesystems. #264

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
511410a
Corrections for operating systems with case-sensitive filesystems.
lawfordp2017 Mar 23, 2022
df007ac
Update to install script to use STAGING_DIR allowing for build withou…
jhs507 Mar 23, 2022
5607738
Attempt to resolve missing include for spdlog on my system
lawfordp2017 Mar 24, 2022
6f02ef0
Hardcode staging_dir
lawfordp2017 Mar 24, 2022
df60208
Fix commenting
lawfordp2017 Mar 24, 2022
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
4 changes: 4 additions & 0 deletions crhmcode/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ set(ACTIVE_LOG_LEVEL "2")
# relative to the src folder.
set(LOCAL_BOOST_LOCATION "/libs/boost_1_75_0")

# Set the staging directory for finding spdlog library
set(STAGING_DIR ".")

#If no Build Type is specified default to Release
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
Expand Down Expand Up @@ -73,6 +76,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
"${PROJECT_SOURCE_DIR}/modules/newmodules"
"${PROJECT_SOURCE_DIR}/modules/waterquality"
"${PROJECT_SOURCE_DIR}/modules/hype"
"${PROJECT_SOURCE_DIR}/libs/spdlog/include"
"${PROJECT_SOURCE_DIR}/${LOCAL_BOOST_LOCATION}"
)

Expand Down
3 changes: 2 additions & 1 deletion crhmcode/src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ add_library(core OBJECT
CRHM_parse.cpp
CRHMArguments.cpp
CRHMLogger.cpp
CRHMMain.cpp
CRHMmain.cpp
GlobalDll.cpp
MacroClass.cpp
MacroUnit.cpp
Expand All @@ -51,6 +51,7 @@ add_dependencies(core spdlog exec def filter)
target_include_directories(core PUBLIC
#Gets the SPDLOG headers
"${STAGING_DIR}/include/"
"${PROJECT_SOURCE_DIR}/libs/spdlog/include"
#Configuration needed to access ACTIVE_LOG_LEVEL
"${PROJECT_SOURCE_DIR}/crhmConfig.h"
#Boost headers required by CRHM_parse
Expand Down
2 changes: 1 addition & 1 deletion crhmcode/src/install_crhm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

mkdir build
cd ./build
cmake ../
cmake ../ -DSTAGING_DIR=.
make install
4 changes: 2 additions & 2 deletions crhmcode/src/modules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ add_subdirectory(waterquality)
#create modules object libary
add_library(modules OBJECT
Class_z_s_rho.cpp
Class3D_Param.cpp
Class3D_param.cpp
Classalbedo.cpp
ClassalbedoBaker.cpp
Classalbedoobs.cpp
Expand Down Expand Up @@ -49,7 +49,7 @@ add_library(modules OBJECT
Classlake.cpp
ClassLongVt.cpp
ClassMeltRunoff_Kstorage.cpp
ClassMeltRunoff_lag.cpp
ClassMeltRunoff_Lag.cpp
ClassMod_Exec.cpp
ClassNeedle.cpp
Classnetall.cpp
Expand Down