kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

CMake: Replace include_directories with target_include_directories

Browse Source
This commit is contained in:
wmayer
2025-07-31 15:57:16 +02:00
committed by Ladislav Michl
parent 7e57b6e7b0
commit 93db4c7d8a
45 changed files with 499 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Mod/TechDraw/App/CMakeLists.txt
View File

@@ -1,12 +1,3 @@
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
set(TechDrawLIBS
Measure
Part
@@ -18,14 +9,6 @@ if (BUILD_IMPORT)
list(APPEND TechDrawLIBS Import)
endif ()
include_directories(
SYSTEM
${QtConcurrent_INCLUDE_DIRS}
${QtCore_INCLUDE_DIR}
${QtGui_INCLUDE_DIR}
${QtWidgets_INCLUDE_DIRS}
)
list(APPEND TechDrawLIBS
${QtConcurrent_LIBRARIES}
${QtCore_LIBRARIES}
@@ -276,8 +259,35 @@ if(FREECAD_USE_PCH)
ADD_MSVC_PRECOMPILED_HEADER(TechDraw PreCompiled.h PreCompiled.cpp PCH_SRCS)
endif(FREECAD_USE_PCH)
add_library(TechDraw SHARED ${TechDraw_SRCS} ${Draw_SRCS} ${TechDrawAlgos_SRCS}
${Geometry_SRCS} ${Python_SRCS})
add_library(TechDraw SHARED
${TechDraw_SRCS}
${Draw_SRCS}
${TechDrawAlgos_SRCS}
${Geometry_SRCS}
${Python_SRCS}
)
target_include_directories(
TechDraw
PRIVATE
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
target_include_directories(
TechDraw
SYSTEM
PUBLIC
${QtConcurrent_INCLUDE_DIRS}
${QtCore_INCLUDE_DIR}
${QtGui_INCLUDE_DIR}
${QtWidgets_INCLUDE_DIRS}
)
target_link_libraries(TechDraw ${TechDrawLIBS} ${TechDraw})
if (FREECAD_WARN_ERROR)
target_compile_warn_error(TechDraw)

28
src/Mod/TechDraw/Gui/CMakeLists.txt
View File

@@ -11,13 +11,6 @@ if(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
endif()
endif()
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
# The XML files
set(TechDrawGui_XML_SRCS
)
@@ -472,8 +465,25 @@ if(FREECAD_USE_PCH)
ADD_MSVC_PRECOMPILED_HEADER(TechDrawGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
endif(FREECAD_USE_PCH)
add_library(TechDrawGui SHARED ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS} ${TechDrawGuiViewProvider_SRCS}
${TechDrawGuiNav_SRCS} ${TechDrawGuiIcon_SVG} ${TechDrawGuiFonts} ${MRTE_SRCS})
add_library(TechDrawGui SHARED
${TechDrawGui_SRCS}
${TechDrawGuiView_SRCS}
${TechDrawGuiViewProvider_SRCS}
${TechDrawGuiNav_SRCS}
${TechDrawGuiIcon_SVG}
${TechDrawGuiFonts}
${MRTE_SRCS}
)
target_include_directories(
TechDrawGui
PRIVATE
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(TechDrawGui ${TechDrawGui_LIBS})
if (FREECAD_WARN_ERROR)
target_compile_warn_error(TechDrawGui)