diff options
| author | bubnikv <bubnikv@gmail.com> | 2019-03-13 18:06:21 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2019-03-13 18:06:21 +0300 |
| commit | 8d8df8b6700d9f98b8aed1dbe77af488b4fe40ef (patch) | |
| tree | f30760291336ad8f3bf5ddefd8b6de71a5735544 /src/CMakeLists.txt | |
| parent | 2ba661cb7640a1393eb82889ab3e9906314d5237 (diff) | |
added missing slic3r.hpp
removed slic3r-noconsole.exe from the windows builds
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b38ae3665..945328a00 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,9 +88,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/slic3r.rc.in ${CMAKE_CUR configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/slic3r.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/slic3r.manifest @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY) if (MSVC) - add_library(slic3r SHARED slic3r.cpp) + add_library(slic3r SHARED slic3r.cpp slic3r.hpp) else () - add_executable(slic3r slic3r.cpp) + add_executable(slic3r slic3r.cpp slic3r.hpp) endif () if (NOT MSVC) if(SLIC3R_GUI) @@ -161,11 +161,6 @@ if (MSVC) target_compile_definitions(slic3r_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE -DSLIC3R_WRAPPER_NOGUI) add_dependencies(slic3r_app_console slic3r) set_target_properties(slic3r_app_console PROPERTIES OUTPUT_NAME "slic3r-console") - - add_executable(slic3r_app_noconsole WIN32 slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc) - target_compile_definitions(slic3r_app_noconsole PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE -DSLIC3R_WRAPPER_NOGUI) - add_dependencies(slic3r_app_noconsole slic3r) - set_target_properties(slic3r_app_noconsole PROPERTIES OUTPUT_NAME "slic3r-noconsole") endif () # Link the resources dir to where Slic3r GUI expects it @@ -213,7 +208,6 @@ if (WIN32) if (MSVC) install(TARGETS slic3r_app_gui RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") install(TARGETS slic3r_app_console RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") - install(TARGETS slic3r_app_noconsole RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}") endif () else () install(TARGETS slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") |