From 59e45e0ae9813ec7dffb2e3aadb7175f311d28ee Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 17 Apr 2015 18:13:51 +0200 Subject: [PATCH] + use .dylib for normal shared libraries under MacOSX --- CMakeLists.txt | 4 ---- cMake/FreeCadMacros.cmake | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 337fd7af8..c2334155f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -822,10 +822,6 @@ IF(MINGW) # SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc -static-libstdc++") LINK_LIBRARIES(-lgdi32) ENDIF(MINGW) -# 0000661: cmake build on Mac OS: dealing with dylib versus so -IF(APPLE) - SET(CMAKE_SHARED_LIBRARY_SUFFIX ".so") -ENDIF(APPLE) # force build directory to be different to source directory #if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake index 34bdabeac..d47caa836 100644 --- a/cMake/FreeCadMacros.cmake +++ b/cMake/FreeCadMacros.cmake @@ -251,5 +251,8 @@ MACRO(SET_PYTHON_PREFIX_SUFFIX ProjectName) if(WIN32) set_target_properties(${ProjectName} PROPERTIES SUFFIX ".pyd") + # 0000661: cmake build on Mac OS: dealing with dylib versus so + elseif(APPLE) + set_target_properties(${ProjectName} PROPERTIES SUFFIX ".so") endif(WIN32) ENDMACRO(SET_PYTHON_PREFIX_SUFFIX)