From 952ca18bf9e84835d72838d54a5ccfb484af2fcd Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Thu, 17 Aug 2017 19:43:14 +0200 Subject: [PATCH] Modified to compile on Ubuntu --- CMakeLists.txt | 2 +- cmake/modules/FindAlienWx.cmake | 14 +++++++------- xs/CMakeLists.txt | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ec5cce58..10ae7eca6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Boost 1.63 requires CMake 3.7 or newer -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 2.8) project(Slic3r) diff --git a/cmake/modules/FindAlienWx.cmake b/cmake/modules/FindAlienWx.cmake index 42efcc770..8e8a942a2 100644 --- a/cmake/modules/FindAlienWx.cmake +++ b/cmake/modules/FindAlienWx.cmake @@ -40,13 +40,13 @@ my \$defines = ' ' . Alien::wxWidgets->defines; my \$cflags = Alien::wxWidgets->c_flags; my \$linkflags = Alien::wxWidgets->link_flags; my \$libraries = ' ' . Alien::wxWidgets->libraries(@components); -my @libraries = Alien::wxWidgets->link_libraries(@components); -my @implib = Alien::wxWidgets->import_libraries(@components); -my @shrlib = Alien::wxWidgets->shared_libraries(@components); -my @keys = Alien::wxWidgets->library_keys; # 'gl', 'adv', ... -my \$library_path = Alien::wxWidgets->shared_library_path; -my \$key = Alien::wxWidgets->key; -my \$prefix = Alien::wxWidgets->prefix; +#my @libraries = Alien::wxWidgets->link_libraries(@components); +#my @implib = Alien::wxWidgets->import_libraries(@components); +#my @shrlib = Alien::wxWidgets->shared_libraries(@components); +#my @keys = Alien::wxWidgets->library_keys; # 'gl', 'adv', ... +#my \$library_path = Alien::wxWidgets->shared_library_path; +#my \$key = Alien::wxWidgets->key; +#my \$prefix = Alien::wxWidgets->prefix; my \$filename = '${AlienWx_TEMP_INCLUDE}'; open(my $fh, '>', \$filename) or die \"Could not open file '\$filename' \$!\"; diff --git a/xs/CMakeLists.txt b/xs/CMakeLists.txt index bb2ff1aff..06757cf82 100644 --- a/xs/CMakeLists.txt +++ b/xs/CMakeLists.txt @@ -116,10 +116,10 @@ find_package(PerlEmbed REQUIRED) target_include_directories(XS PRIVATE ${PERL_INCLUDE_PATH}) target_compile_options(XS PRIVATE ${PerlEmbed_CCFLAGS}) # If the Perl is compiled with optimization off, disable optimization over the whole project. -if ("-Od" IN_LIST PerlEmbed_CCFLAGS OR "/Od" IN_LIST PerlEmbed_CCFLAGS) - set(CMAKE_CXX_FLAGS_RELEASE /Od) - set(CMAKE_C_FLAGS_RELEASE /Od) -endif() +#if ("-Od" IN_LIST PerlEmbed_CCFLAGS OR "/Od" IN_LIST PerlEmbed_CCFLAGS) +# set(CMAKE_CXX_FLAGS_RELEASE /Od) +# set(CMAKE_C_FLAGS_RELEASE /Od) +#endif() target_link_libraries(XS ${PERL_LIBRARY}) ## REQUIRED packages