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

Fixes MacOs installation and adding options to restListMacros #509

Merged
merged 10 commits into from
Mar 18, 2024
Merged

Fixes MacOs installation and adding options to restListMacros #509

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af66614
Fixes MacOs installation by providing header directory of brew instal…
jgalan Feb 28, 2024
538c213
CMakeLists.txt now pcm files go into the lib directory also for MacOs
jgalan Feb 28, 2024
ea4e875
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 28, 2024
4fdcbce
REST_ListMacros. Adding new arguments to restListMacros
jgalan Feb 29, 2024
c95886c
Merge branch 'jgalan_macos_brew' of github.com:rest-for-physics/frame…
jgalan Feb 29, 2024
d555ed6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 29, 2024
4b88070
Merge branch 'master' into jgalan_macos_brew
jgalan Feb 29, 2024
b1b7321
Replacing obsolete cmake function
jgalan Feb 29, 2024
ca31bec
Merge branch 'jgalan_macos_brew' of github.com:rest-for-physics/frame…
jgalan Feb 29, 2024
3b54c8e
Merge branch 'master' into jgalan_macos_brew
jgalan Mar 12, 2024
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
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ endif ()
set(external_include_dirs)
set(external_libs)

if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(external_include_dirs ${external_include_dirs} "/usr/local/include/")
message(STATUS "Adding BREW include directory: /usr/local/include")
endif (CMAKE_SYSTEM_NAME MATCHES "Darwin")

set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${DECAY_PATH}/cmake
${CMAKE_MODULE_PATH})
set(CMAKE_MACOSX_RPATH 1)
Expand Down Expand Up @@ -356,7 +361,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") # we must call library install here in
endif ()

# Copy pcm files
if (CMAKE_SYSTEM_NAME MATCHES "Darwin" OR CMAKE_SYSTEM_NAME MATCHES "Windows")
if (CMAKE_SYSTEM_NAME MATCHES "Windows")

# Copy pcm files to bin
install(
Expand Down
Loading