3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 12:41:20 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
Vojtech Bubnik 2017-08-18 14:18:42 -07:00
commit 3469bb2ea6
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cmake/modules/FindPerlEmbed.cmake
View file

@ -73,6 +73,7 @@ if (PerlEmbed_DEBUG)
message(STATUS " PERL_EXTRA_C_FLAGS = ${PERL_EXTRA_C_FLAGS}")
# Second show the configuration extracted by this module (FindPerlEmbed):
message(STATUS " PerlEmbed_CCFLAGS = ${PerlEmbed_CCFLAGS}")
message(STATUS " PerlEmbed_CCCDLFLAGS = ${PerlEmbed_CCCDLFLAGS}")
message(STATUS " LD = ${PerlEmbed_LD}")
message(STATUS " PerlEmbed_LDFLAGS = ${PerlEmbed_LDFLAGS}")
message(STATUS " PerlEmbed_LDDLFLAGS = ${PerlEmbed_LDDLFLAGS}")

2
xs/CMakeLists.txt
View file

@ -404,6 +404,8 @@ target_compile_options(XS PRIVATE ${PerlEmbed_CCFLAGS})
# set(CMAKE_CXX_FLAGS_RELEASE /Od)
# set(CMAKE_C_FLAGS_RELEASE /Od)
#endif()
# The following line will add -fPIC on Linux to make the XS.so rellocable.
add_definitions(${PerlEmbed_CCCDLFLAGS})
if (NOT APPLE)
target_link_libraries(XS ${PERL_LIBRARY})
endif()