diff options
author | FormerLurker <hochgebe@gmail.com> | 2021-01-03 23:18:02 +0300 |
---|---|---|
committer | FormerLurker <hochgebe@gmail.com> | 2021-01-03 23:18:02 +0300 |
commit | d4852e3e537ab891309f4a6c6d25cae4954c9225 (patch) | |
tree | 1969a95f3bcc01d06f19f63370fc33c15587c8cc /PyArcWelder | |
parent | b0ffde1402a0fe3b1fd448bd00f0a18a0050d678 (diff) |
Add static linking for windows exe. Remove mingw build. Add copyright notices for fpconv to exe output.
Diffstat (limited to 'PyArcWelder')
-rw-r--r-- | PyArcWelder/CMakeLists.txt | 8 | ||||
-rw-r--r-- | PyArcWelder/sourcelist.cmake | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/PyArcWelder/CMakeLists.txt b/PyArcWelder/CMakeLists.txt index 593eaf2..c4462a6 100644 --- a/PyArcWelder/CMakeLists.txt +++ b/PyArcWelder/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION "3.13") +cmake_minimum_required (VERSION "3.15") project(PyArcWelder C CXX) @@ -15,6 +15,12 @@ include_directories(${PYTHON_INCLUDE_DIRS} ${ArcWelder_INCLUDE_DIRS} ${GcodeProc # PyArcWelderSources variable include(sourcelist.cmake) + +if(MSVC) + # link to the msvc runtime statically, keeping debug info if we are in debug config + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") +endif() + # Create our library add_library(${PROJECT_NAME} SHARED ${PyArcWelderSources}) diff --git a/PyArcWelder/sourcelist.cmake b/PyArcWelder/sourcelist.cmake index ff43231..e1a425d 100644 --- a/PyArcWelder/sourcelist.cmake +++ b/PyArcWelder/sourcelist.cmake @@ -7,4 +7,4 @@ set(PyArcWelderSources ${PyArcWelderSources} py_logger.h python_helpers.cpp python_helpers.h -)
\ No newline at end of file +) |