SHS/cmake
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support for <module>_DIR search dir

Browse Source
This commit is contained in:
Пелипенко Иван
2022-08-07 22:06:29 +03:00
parent 61699f2283
commit 7bca337d1f
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SHSTKMacros.cmake
View File

@@ -14,7 +14,7 @@ shstk_add_directories(domain)
shstk_add_directories_with_include(is_qt domain)
shstk_set_find_dirs(domain)
shstk_set_find_dirs(domain module)
shstk_find_header(module filename add_find_info)
@@ -55,7 +55,7 @@ macro(shstk_begin_project domain module)
if("x${BUILD_NUMBER}" STREQUAL "x")
set(BUILD_NUMBER 0)
endif()
shstk_define_option(LOCAL "Local install" OFF)
if (DEFINED ENV{QNX_HOST} OR PIP_FREERTOS)
set(STATIC_LIB_DEFAULT ON)
@@ -86,7 +86,7 @@ macro(shstk_begin_project domain module)
set(_install_msg ON) # CACHE STRING "shstk_install_msg")
message(STATUS "Install to ${_path}")
endif()
if (CMAKE_BUILD_TYPE MATCHES Debug)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -Wall")
@@ -94,7 +94,7 @@ macro(shstk_begin_project domain module)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall")
endif()
if(MINGW)
list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIB})
endif()
@@ -114,7 +114,7 @@ macro(shstk_begin_project domain module)
if (DEFINED ANDROID_PLATFORM)
include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)
endif()
set(_qt_libs )
set(_qt_apps )
set(_qt_plugs)
@@ -132,7 +132,7 @@ macro(shstk_begin_project domain module)
set(${domain}_LIB_TYPE SHARED)
set(${domain}_LIB_TYPE_MSG "Shared")
endif()
if (CMAKE_BUILD_TYPE MATCHES Debug)
set(${domain}_BUILD_TYPE "Debug")
#add_definitions(-DPIP_DEBUG)
@@ -157,9 +157,9 @@ macro(shstk_begin_project domain module)
set_deploy_property(${domain} ${${domain}_LIB_TYPE}
FULLNAME "${${domain}_DOMAIN}.*"
COMPANY "${${domain}_COMPANY}")
endif()
endmacro()
@@ -254,7 +254,7 @@ macro(shstk_add_directories_with_include is_qt domain)
#set(QT_MULTILIB_LIST "${QT_MULTILIB_LIST}" CACHE STRING "")
endif()
endforeach()
foreach(_d ${DIRS})
add_subdirectory(${_d})
endforeach()
@@ -263,7 +263,7 @@ macro(shstk_add_directories_with_include is_qt domain)
endmacro()
macro(shstk_set_find_dirs domain)
macro(shstk_set_find_dirs domain module)
#set(_PIP_INCDIR "${PIP_DIR}/include/pip")
#set(_PIP_LIBDIR "${PIP_DIR}/lib")
set(${domain}_INCDIR)
@@ -275,6 +275,11 @@ macro(shstk_set_find_dirs domain)
# list(APPEND ${domain}_INCDIR "${${domain}_ROOT_SRC}")
# list(APPEND ${domain}_LIBDIR "${${domain}_ROOT_BIN}")
#endif()
if(DEFINED ${module}_DIR)
list(APPEND ${domain}_LIBDIR "${${module}_DIR}/lib")
list(APPEND ${domain}_INCDIR "${${module}_DIR}/include/${domain}")
list(APPEND ${domain}_BINDIR "${${module}_DIR}/bin")
endif()
if(MINGW_INCLUDE)
list(APPEND ${domain}_INCDIR "${MINGW_INCLUDE}/${domain}")
list(APPEND ${domain}_LIBDIR "${MINGW_LIB}")