3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake build system - fixes for OSX. Now a working XS.bundle is being generated.

Browse Source
This commit is contained in:
Vojtech Bubnik 2017-08-18 13:06:10 -07:00
parent ba1c0b0137
commit 9620596d59
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xs/CMakeLists.txt
View File

@ -313,7 +313,12 @@ add_custom_command(
) )
# Define the Perl XS shared library. # Define the Perl XS shared library.
add_library(XS SHARED if(APPLE)
set(XS_SHARED_LIBRARY_TYPE MODULE)
else()
set(XS_SHARED_LIBRARY_TYPE SHARED)
endif()
add_library(XS ${XS_SHARED_LIBRARY_TYPE}
${XS_MAIN_CPP} ${XS_MAIN_CPP}
${LIBDIR}/libslic3r/utils.cpp ${LIBDIR}/libslic3r/utils.cpp
${LIBDIR}/perlglue.cpp ${LIBDIR}/perlglue.cpp
@ -325,6 +330,11 @@ add_library(XS SHARED
# Used by Perl xsubpp to generate XS.cpp # Used by Perl xsubpp to generate XS.cpp
${CMAKE_CURRENT_LIST_DIR}/xsp/typemap.xspt ${CMAKE_CURRENT_LIST_DIR}/xsp/typemap.xspt
) )
if(APPLE)
set_target_properties(XS PROPERTIES BUNDLE TRUE)
# Ignore undefined symbols of the perl interpreter, they will be found in the caller image.
target_link_libraries(XS "-undefined dynamic_lookup")
endif()
target_link_libraries(XS libslic3r libslic3r_gui admesh clipper nowide polypartition poly2tri) target_link_libraries(XS libslic3r libslic3r_gui admesh clipper nowide polypartition poly2tri)
if(SLIC3R_DEBUG) if(SLIC3R_DEBUG)
target_link_libraries(Shiny) target_link_libraries(Shiny)
@ -394,7 +404,9 @@ target_compile_options(XS PRIVATE ${PerlEmbed_CCFLAGS})
# set(CMAKE_CXX_FLAGS_RELEASE /Od) # set(CMAKE_CXX_FLAGS_RELEASE /Od)
# set(CMAKE_C_FLAGS_RELEASE /Od) # set(CMAKE_C_FLAGS_RELEASE /Od)
#endif() #endif()
target_link_libraries(XS ${PERL_LIBRARY}) if (NOT APPLE)
target_link_libraries(XS ${PERL_LIBRARY})
endif()
## REQUIRED packages ## REQUIRED packages