1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
|
Description: Use system includes also for mtest
Author: mirabilos <tg@debian.org>
Forwarded: https://github.com/musescore/MuseScore/pull/4143
Applied-Upstream: master, commit:5d889d7f3, v3.1
--- a/mtest/CMakeLists.txt
+++ b/mtest/CMakeLists.txt
@@ -17,9 +17,14 @@ enable_testing()
include_directories(
${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}
- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
)
+if (USE_SYSTEM_FREETYPE)
+ include_directories(${FREETYPE_INCLUDE_DIRS})
+else (USE_SYSTEM_FREETYPE)
+ include_directories(${PROJECT_SOURCE_DIR}/thirdparty/freetype/include)
+endif (USE_SYSTEM_FREETYPE)
+
if (OMR)
set(OMR_SRC ${PROJECT_SOURCE_DIR}/omr/importpdf.cpp)
endif (OMR)
@@ -110,9 +115,14 @@ add_executable(
target_link_libraries(
mtest
${QT_LIBRARIES}
- mscore_freetype
)
+if (USE_SYSTEM_FREETYPE)
+ target_link_libraries(mtest freetype)
+else (USE_SYSTEM_FREETYPE)
+ target_link_libraries(mtest mscore_freetype)
+endif (USE_SYSTEM_FREETYPE)
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
--- a/mtest/cmake.inc
+++ b/mtest/cmake.inc
@@ -30,10 +30,15 @@ target_link_libraries(
qzip
z
${QT_LIBRARIES}
- mscore_freetype
z
)
+if (USE_SYSTEM_FREETYPE)
+ target_link_libraries(${TARGET} freetype)
+else (USE_SYSTEM_FREETYPE)
+ target_link_libraries(${TARGET} mscore_freetype)
+endif (USE_SYSTEM_FREETYPE)
+
if (NOT MINGW AND NOT APPLE)
target_link_libraries(${TARGET}
dl
|