GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 00:11:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move git commit out of the wx blocked areas.

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-30 23:18:58 -05:00
parent 02acbd625a
commit d862d5f574
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/CMakeLists.txt
View File

@ -70,6 +70,17 @@ else(SLIC3R_STATIC)
set(Boost_USE_STATIC_RUNTIME OFF) set(Boost_USE_STATIC_RUNTIME OFF)
endif(SLIC3R_STATIC) endif(SLIC3R_STATIC)
if (NOT GIT_VERSION STREQUAL "")
if (MSVC)
add_compile_options(/DSLIC3R_BUILD_COMMIT=${GIT_VERSION})
else(MSVC)
execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_VERSION_1)
string(REGEX REPLACE "\n$" "" GIT_VERSION "${GIT_VERSION_1}")
add_compile_options(-DSLIC3R_BUILD_COMMIT=${GIT_VERSION})
endif(MSVC)
endif(NOT GIT_VERSION STREQUAL "")
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(Boost REQUIRED COMPONENTS system thread filesystem) find_package(Boost REQUIRED COMPONENTS system thread filesystem)
@ -292,15 +303,6 @@ IF(wxWidgets_FOUND)
MESSAGE("wx found!") MESSAGE("wx found!")
INCLUDE("${wxWidgets_USE_FILE}") INCLUDE("${wxWidgets_USE_FILE}")
if (NOT GIT_VERSION STREQUAL "")
if (MSVC)
add_compile_options(/DSLIC3R_BUILD_COMMIT=${GIT_VERSION})
else(MSVC)
execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_VERSION)
string(REGEX REPLACE "\n$" "" GIT_VERSION "${GIT_VERSION}")
add_compile_options(-DSLIC3R_BUILD_COMMIT=${GIT_VERSION})
endif(MSVC)
endif(NOT GIT_VERSION STREQUAL "")
include_directories(${GUI_LIBDIR}) include_directories(${GUI_LIBDIR})
include_directories(${wxWidgets_INCLUDE}) include_directories(${wxWidgets_INCLUDE})