|
|
@@ -29,6 +29,8 @@ endif(MSVC)
|
|
|
set(MOD_VERSION_STRING "0.0.1-dev1")
|
|
|
add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
|
|
|
|
|
|
+MESSAGE( STATUS "CONAN_INCLUDE_DIRS_JSONCPP = ${CONAN_INCLUDE_DIRS_JSONCPP}")
|
|
|
+
|
|
|
target_include_directories(${MODULE_NAME} PRIVATE
|
|
|
${MODULE_BASE_DIR}/mod_MobileDial
|
|
|
${MODULE_BASE_DIR}/mod_accessauth
|
|
|
@@ -37,10 +39,16 @@ target_include_directories(${MODULE_NAME} PRIVATE
|
|
|
${MODULE_BASE_DIR}/mod_cardissuer
|
|
|
${MODULE_BASE_DIR}/mod_MaintainWatcher
|
|
|
${MODULE_BASE_DIR}/mod_cardissuer
|
|
|
+ ${CONAN_INCLUDE_DIRS_JSONCPP}
|
|
|
+ ${OTHER_LIB_BASE_DIR}/libRestfulFunc
|
|
|
+)
|
|
|
+
|
|
|
+target_link_directories(${MODULE_NAME} PRIVATE
|
|
|
+ ${CONAN_LIB_DIRS_JSONCPP}
|
|
|
)
|
|
|
|
|
|
# 添加实体需要依赖的其他共享库（包括系统库）
|
|
|
-set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS})
|
|
|
+set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_ALL_LIBS} ${CONAN_PKG_LIBS_JSONCPP})
|
|
|
if(MSVC)
|
|
|
conan_cmake_run(REQUIRES WTL/8.1.12085@LR04.02_ThirdParty/stable BASIC_SETUP CMAKE_TARGETS)
|
|
|
add_subdirectory(${CONAN_WTL_ROOT} ${CMAKE_CURRENT_BINARY_DIR}/WTL)
|
gifur