Added various manifests,

added auto generation of includes and manifests from version and build
variables,
resurrected SLIC3R_LOGLEVEL env var.
This commit is contained in:
bubnikv 2018-09-24 11:53:05 +02:00
parent 9f2cd347e3
commit 96e035b2f8
11 changed files with 100 additions and 26 deletions

View file

@ -1,6 +1,8 @@
project(libslic3r)
cmake_minimum_required(VERSION 2.6)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h @ONLY)
add_library(libslic3r STATIC
BoundingBox.cpp
BoundingBox.hpp
@ -96,6 +98,7 @@ add_library(libslic3r STATIC
Layer.hpp
LayerRegion.cpp
libslic3r.h
"${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h"
Line.cpp
Line.hpp
Model.cpp
@ -149,7 +152,7 @@ add_library(libslic3r STATIC
)
target_compile_definitions(libslic3r PUBLIC -DUSE_TBB ${PNG_DEFINITIONS})
target_include_directories(libslic3r PUBLIC BEFORE ${LIBNEST2D_INCLUDES} ${PNG_INCLUDE_DIRS})
target_include_directories(libslic3r PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${LIBNEST2D_INCLUDES} ${PNG_INCLUDE_DIRS})
target_link_libraries(libslic3r
${LIBNEST2D_LIBRARIES}
admesh

View file

@ -1,6 +1,8 @@
#ifndef _libslic3r_h_
#define _libslic3r_h_
#include "libslic3r_version.h"
// this needs to be included early for MSVC (listing it in Build.PL is not enough)
#include <ostream>
#include <iostream>
@ -15,10 +17,6 @@
#include "Technologies.hpp"
#define SLIC3R_FORK_NAME "Slic3r Prusa Edition"
#define SLIC3R_VERSION "1.41.0"
#define SLIC3R_BUILD "UNKNOWN"
typedef int32_t coord_t;
typedef double coordf_t;

View file

@ -0,0 +1,8 @@
#ifndef __SLIC3R_VERSION_H
#define __SLIC3R_VERSION_H
#define SLIC3R_FORK_NAME "@SLIC3R_FORK_NAME@"
#define SLIC3R_VERSION "@SLIC3R_VERSION@"
#define SLIC3R_BUILD "@SLIC3R_BUILD@"
#endif /* __SLIC3R_VERSION_H */