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

[SofaKernel] FIX: A few fix to compile on Mac OSX Xcode 9 and Linux gcc 7.3.0 #969

Merged
merged 7 commits into from
Mar 28, 2019
Merged

[SofaKernel] FIX: A few fix to compile on Mac OSX Xcode 9 and Linux gcc 7.3.0 #969

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
608ac45
[FIX MAC OSX] Fix compiling error on Mac osx using XCode 9
fspadoni Feb 15, 2019
f9f8e2d
[Linux] Fix a weird linking error on Linux. pthread needs to be set a…
fspadoni Mar 4, 2019
023d3d5
Merge branch 'master' of https://github.com/epernod/sofa into FixComp…
fspadoni Mar 14, 2019
f8e489c
Merge branch 'master' of https://github.com/sofa-framework/sofa into …
fspadoni Mar 14, 2019
cddb536
[SimulationCore] Fix compiling error: initialization of std::atomic_flag
fspadoni Mar 15, 2019
386ba1d
[SofaFramework][CMake] remove duplicate line for find_library(ICONV i…
fspadoni Mar 26, 2019
a127801
[SofaFramework][CMake] target_link_options is only available starting…
fspadoni Mar 26, 2019
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 SofaKernel/framework/sofa/core/objectmodel/BaseClass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#include <sofa/core/objectmodel/BaseClass.h>
#include <sofa/helper/logging/Messaging.h>

#ifdef __GNUC__
#include <cxxabi.h>
#endif // __GNUC__

namespace sofa
{

Expand Down
2 changes: 2 additions & 0 deletions SofaKernel/framework/sofa/helper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ if(SOFA-EXTERNAL_FFMPEG)

endif()
if(APPLE)
find_library(ICONV iconv)
fspadoni marked this conversation as resolved.
Show resolved Hide resolved
target_link_libraries(${PROJECT_NAME} PUBLIC ${ICONV})
# on macOS, -framework CoreServices is needed for FileMonitor
list(APPEND SOFAFRAMEWORK_DEPENDENCY_LINK "-framework CoreServices")
endif()
Expand Down
5 changes: 4 additions & 1 deletion SofaKernel/framework/sofa/simulation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ set(SOURCE_FILES
InitTasks.cpp
)


# is this a compiler/linker version specific problem?
if(CMAKE_SYSTEM_NAME STREQUAL Linux)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread" )
Copy link
Contributor

@tgaugry tgaugry Mar 20, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

target_compile_options

Copy link
Contributor Author

@fspadoni fspadoni Mar 26, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-pthread should be passed as linking options:
target_link_options(${PROJECT_NAME} PUBLIC "-pthread")
This doesn't work because the target_link_options is available only starting from CMake 3.13

endif()

add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} PUBLIC SofaCore)
Expand Down
3 changes: 2 additions & 1 deletion SofaKernel/framework/sofa/simulation/Locks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ namespace sofa
public:

SpinLock()
:_flag()
{}

~SpinLock()
Expand Down Expand Up @@ -70,7 +71,7 @@ namespace sofa

private:

std::atomic_flag _flag = ATOMIC_FLAG_INIT;
std::atomic_flag _flag;

char _pad [CACHE_LINE - sizeof(std::atomic_flag)];
};
Expand Down