Skip to content

Commit 9e179bc

Browse files
committed
Move bundled exprtk.hpp to src/ so it doesn't get installed
1 parent 467f217 commit 9e179bc

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

modules/mrpt_expr/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ set(LIB_PUBLIC_HDRS
4141
include/mrpt/expr/CRuntimeCompiledExpression.h
4242
)
4343

44-
if (NOT MRPT_USE_SYSTEM_EXPRTK)
45-
list(APPEND LIB_PUBLIC_HDRS
46-
include/mrpt/expr/exprtk.hpp
47-
)
48-
endif()
49-
5044
mrpt_add_library(
5145
TARGET ${PROJECT_NAME}
5246
SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
@@ -61,6 +55,11 @@ if (MRPT_USE_SYSTEM_EXPRTK)
6155
target_compile_definitions(${PROJECT_NAME} PRIVATE MRPT_USE_SYSTEM_EXPRTK)
6256
# Add include path as system path to avoid warnings from exprtk.hpp:
6357
target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE ${EXPRTK_INCLUDE_DIR})
58+
else()
59+
# Add include path as system path: src/3rdparty/exprtk:
60+
target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE
61+
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/exprtk
62+
)
6463
endif()
6564

6665
# Don't export ALL symbols for the huge exprtk lib

modules/mrpt_expr/src/CRuntimeCompiledExpression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#if defined(MRPT_USE_SYSTEM_EXPRTK)
3333
#include <exprtk.hpp>
3434
#else
35-
#include <mrpt/3rdparty/exprtk.hpp>
35+
#include <3rdparty/exprtk.hpp>
3636
#endif
3737

3838
using namespace mrpt;

0 commit comments

Comments
 (0)