2
0
Эх сурвалжийг харах

Guard library pragma comments out of cmake builds (#120)

Luminiscental 4 жил өмнө
parent
commit
b681ec6527

+ 2 - 0
CMakeLists.txt

@@ -93,6 +93,8 @@ PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}/include
 	${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 )
 
 
+target_compile_definitions(msdfgen-ext PUBLIC MSDFGEN_CMAKE_BUILD)
+
 if(MSDFGEN_USE_CPP11)
 if(MSDFGEN_USE_CPP11)
 	target_compile_features(msdfgen-ext PUBLIC cxx_std_11)
 	target_compile_features(msdfgen-ext PUBLIC cxx_std_11)
 	target_compile_definitions(msdfgen-ext PUBLIC MSDFGEN_USE_CPP11)
 	target_compile_definitions(msdfgen-ext PUBLIC MSDFGEN_USE_CPP11)

+ 1 - 1
ext/import-font.cpp

@@ -7,7 +7,7 @@
 #include FT_FREETYPE_H
 #include FT_FREETYPE_H
 #include FT_OUTLINE_H
 #include FT_OUTLINE_H
 
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(MSDFGEN_CMAKE_BUILD)
     #pragma comment(lib, "freetype.lib")
     #pragma comment(lib, "freetype.lib")
 #endif
 #endif
 
 

+ 1 - 1
ext/resolve-shape-geometry.cpp

@@ -9,7 +9,7 @@
 #include "../core/edge-segments.h"
 #include "../core/edge-segments.h"
 #include "../core/Contour.h"
 #include "../core/Contour.h"
 
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(MSDFGEN_CMAKE_BUILD)
     #pragma comment(lib, "skia.lib")
     #pragma comment(lib, "skia.lib")
 #endif
 #endif