Skip to content

Use target-specific include dirs #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 29, 2025
Merged

Use target-specific include dirs #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
189a1c0
Use target-specific include dirs
aobolensk Jun 28, 2025
544215b
fmt
aobolensk Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/stb_library.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#pragma clang diagnostic ignored "-Wcast-align"
#endif

#include <stb/stb_image.h>
#include "stb/stb_image.h"

#if defined(__clang__)
#pragma clang diagnostic pop
Expand Down
7 changes: 0 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@ include(cmake/onetbb.cmake)
message( STATUS "PPC step: Setup external projects" )
include(cmake/gtest.cmake)

############################## Headers ##############################

message( STATUS "PPC step: Setup headers" )
include_directories(3rdparty)
include_directories(modules)
include_directories(tasks)

############################## Modules ##############################

message( STATUS "PPC step: Setup modules" )
Expand Down
1 change: 0 additions & 1 deletion cmake/gtest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/googletest/googletest/include)
include(ExternalProject)

ExternalProject_Add(
Expand Down
2 changes: 0 additions & 2 deletions cmake/json.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/json/include)

include(ExternalProject)

ExternalProject_Add(
Expand Down
4 changes: 0 additions & 4 deletions cmake/libenvpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/include)
include_directories(SYSTEM
${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/external/fmt/include)

if(WIN32)
set(PPC_FMT_FLAGS "/EHsc /DFMT_CONSTEVAL=inline")
else()
Expand Down
4 changes: 1 addition & 3 deletions cmake/mpi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
find_package(MPI REQUIRED)
if(MPI_FOUND)
include_directories(${MPI_INCLUDE_PATH})
else(MPI_FOUND)
if(NOT MPI_FOUND)
message(FATAL_ERROR "MPI NOT FOUND")
endif(MPI_FOUND)
2 changes: 0 additions & 2 deletions cmake/onetbb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
include(ExternalProject)

include_directories("${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include")

if(WIN32)
set(ppc_onetbb_TEST_COMMAND
"${CMAKE_COMMAND}" -E copy_directory
Expand Down
1 change: 0 additions & 1 deletion cmake/openmp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ endif()

find_package(OpenMP)
if(OpenMP_FOUND)
include_directories(${OpenMP_C_INCLUDE_DIRS} ${OpenMP_CXX_INCLUDE_DIRS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS
Expand Down
17 changes: 17 additions & 0 deletions modules/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ project(${exec_func_lib})
add_library(${exec_func_lib} STATIC ${LIB_SOURCE_FILES})
set_target_properties(${exec_func_lib} PROPERTIES LINKER_LANGUAGE CXX)

# Add include directories to target
target_include_directories(
${exec_func_lib} PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty
${CMAKE_SOURCE_DIR}/modules ${CMAKE_SOURCE_DIR}/tasks)

# Add external project include directories
target_include_directories(
${exec_func_lib}
PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/onetbb/include
${CMAKE_SOURCE_DIR}/3rdparty/json/include
${CMAKE_SOURCE_DIR}/3rdparty/googletest/googletest/include
${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/include)
target_include_directories(
${exec_func_lib} SYSTEM
PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/libenvpp/external/fmt/include)

add_dependencies(${exec_func_lib} ppc_libenvpp)
target_link_directories(${exec_func_lib} PUBLIC
"${CMAKE_BINARY_DIR}/ppc_libenvpp/install/lib")
Expand Down Expand Up @@ -64,6 +80,7 @@ if(MPI_LINK_FLAGS)
set_target_properties(${exec_func_lib} PROPERTIES LINK_FLAGS
"${MPI_LINK_FLAGS}")
endif(MPI_LINK_FLAGS)
target_include_directories(${exec_func_lib} PUBLIC ${MPI_INCLUDE_PATH})
target_link_libraries(${exec_func_lib} PUBLIC ${MPI_LIBRARIES})

add_library(stb_image STATIC ${CMAKE_SOURCE_DIR}/3rdparty/stb_image_wrapper.cpp)
Expand Down
Loading