summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 16:17:36 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 16:17:36 +0100
commit6d7b6ae9cafff4cbea19b9588c6cb216ee3a42fd (patch)
treeb8cc3e42aa46926a4ae80c1df8861114f3dd08ab /CMakeLists.txt
parentUpdate GETTING-STARTED.md (diff)
downloadcuberite-6d7b6ae9cafff4cbea19b9588c6cb216ee3a42fd.tar
cuberite-6d7b6ae9cafff4cbea19b9588c6cb216ee3a42fd.tar.gz
cuberite-6d7b6ae9cafff4cbea19b9588c6cb216ee3a42fd.tar.bz2
cuberite-6d7b6ae9cafff4cbea19b9588c6cb216ee3a42fd.tar.lz
cuberite-6d7b6ae9cafff4cbea19b9588c6cb216ee3a42fd.tar.xz
cuberite-6d7b6ae9cafff4cbea19b9588c6cb216ee3a42fd.tar.zst
cuberite-6d7b6ae9cafff4cbea19b9588c6cb216ee3a42fd.zip
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df702b29..859575a69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,10 @@ endif()
if(WIN32)
add_flags("/MP")
+elseif(APPLE)
+ if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ add_flags("-pthread")
+ endif()
else()
add_flags("-pthread")
endif()
@@ -114,10 +118,10 @@ endif()
set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE_BAK}")
if (NOT WIN32)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
- set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -rdynamic")
- set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_PROFILE} -rdynamic")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -rdynamic")
+ set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -rdynamic")
+ set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -rdynamic")
+ set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_PROFILE} -rdynamic")
endif()
add_subdirectory (src)