убрал установку лишних инклюдов
This commit is contained in:
@@ -96,7 +96,7 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
|
|||||||
set(CRES)
|
set(CRES)
|
||||||
file(GLOB_RECURSE CPPS "libs/${NAME}/*.cpp" "libs/${NAME}/*.c")
|
file(GLOB_RECURSE CPPS "libs/${NAME}/*.cpp" "libs/${NAME}/*.c")
|
||||||
file(GLOB_RECURSE HS "libs/${NAME}/*.h")
|
file(GLOB_RECURSE HS "libs/${NAME}/*.h")
|
||||||
file(GLOB_RECURSE PHS "libs/${NAME}/*_p.h")
|
file(GLOB_RECURSE PHS "libs/${NAME}/*_p.h" "libs/${NAME}/3rd/*.h")
|
||||||
file(GLOB_RECURSE RES "libs/${NAME}/*.conf")
|
file(GLOB_RECURSE RES "libs/${NAME}/*.conf")
|
||||||
if (NOT "x${PHS}" STREQUAL "x")
|
if (NOT "x${PHS}" STREQUAL "x")
|
||||||
list(REMOVE_ITEM HS ${PHS})
|
list(REMOVE_ITEM HS ${PHS})
|
||||||
@@ -105,6 +105,7 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
|
|||||||
file(GLOB_RECURSE ASRC "${SOURCES}/*.cpp" "${SOURCES}/*.c")
|
file(GLOB_RECURSE ASRC "${SOURCES}/*.cpp" "${SOURCES}/*.c")
|
||||||
list(APPEND CPPS ${ASRC})
|
list(APPEND CPPS ${ASRC})
|
||||||
endif()
|
endif()
|
||||||
|
#message("${NAME} HS = ${HS}")
|
||||||
list(APPEND HDRS ${HS})
|
list(APPEND HDRS ${HS})
|
||||||
list(APPEND PHDRS ${PHS})
|
list(APPEND PHDRS ${PHS})
|
||||||
|
|
||||||
@@ -480,13 +481,11 @@ if (NOT CROSSTOOLS)
|
|||||||
endif()
|
endif()
|
||||||
list(APPEND HDR_DIRS "${_lua_bri_dir}/LuaBridge")
|
list(APPEND HDR_DIRS "${_lua_bri_dir}/LuaBridge")
|
||||||
list(APPEND HDRS ${_lua_src_hdr})
|
list(APPEND HDRS ${_lua_src_hdr})
|
||||||
|
|
||||||
|
|
||||||
# Test program
|
# Test program
|
||||||
if(PIP_UTILS)
|
if(PIP_UTILS)
|
||||||
#add_library(pip_plugin SHARED "test_plugin.h" "test_plugin.cpp")
|
#add_library(pip_plugin SHARED "test_plugin.h" "test_plugin.cpp")
|
||||||
#target_link_libraries(pip_plugin pip)
|
#target_link_libraries(pip_plugin pip)
|
||||||
|
|
||||||
add_executable(pip_test "main.cpp")
|
add_executable(pip_test "main.cpp")
|
||||||
target_link_libraries(pip_test pip)
|
target_link_libraries(pip_test pip)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user