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

Windows works

Browse Source
This commit is contained in:
Пелипенко Иван
2020-09-06 21:45:51 +03:00
parent 42d7579d77
commit 0255151d68
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SHSTKMacros.cmake
View File

@@ -308,18 +308,20 @@ endmacro()
macro(shstk_find_header domain module filename add_find_info) macro(shstk_find_header domain module filename add_find_info)
if(NOT ${module}_VERSION) if(NOT ${module}_VERSION)
find_file(${domain}_H_INCLUDE "${filename}" HINTS ${${domain}_INCDIR}) find_file(${domain}_H_INCLUDE "${filename}" HINTS ${${domain}_INCDIR})
#message("${domain}_H_INCLUDE \"${filename}\" HINTS \"${${domain}_INCDIR}\" = \"${${domain}_H_INCLUDE}\"")
if (NOT ${domain}_H_INCLUDE) if (NOT ${domain}_H_INCLUDE)
message(FATAL_ERROR "Can`t find ${module} version file (\"${filename}\")!") message(FATAL_ERROR "Can`t find ${module} version file (\"${filename}\")!")
endif() endif()
#if (DEFINED ANDROID_PLATFORM) #if (DEFINED ANDROID_PLATFORM)
# set(CD_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/${domain}) # set(CD_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/${domain})
#else() #else()
get_filename_component(${domain}_INCLUDES ${${domain}_H_INCLUDE} PATH) get_filename_component(_inc ${${domain}_H_INCLUDE} PATH)
set(${domain}_INCLUDES "${_inc}" CACHE STRING "")
#endif() #endif()
include(CheckSymbolExists) include(CheckSymbolExists)
check_symbol_exists(${module}_VERSION_NAME "${${domain}_INCLUDES}/${filename}" _version_found) check_symbol_exists(${module}_VERSION_NAME "${${domain}_H_INCLUDE}" _version_found)
if (_version_found) if (_version_found)
file(STRINGS "${${domain}_INCLUDES}/${filename}" _version REGEX "^[ \t]*#define[ \t]+${module}_VERSION_NAME+[ \t]+.*$") file(STRINGS "${${domain}_H_INCLUDE}" _version REGEX "^[ \t]*#define[ \t]+${module}_VERSION_NAME+[ \t]+.*$")
string(REGEX MATCH "\".*\"" _version ${_version}) string(REGEX MATCH "\".*\"" _version ${_version})
string(LENGTH ${_version} SL) string(LENGTH ${_version} SL)
math(EXPR SL ${SL}-2) math(EXPR SL ${SL}-2)

2
SHSTKQtMacros.cmake
View File

@@ -154,6 +154,8 @@ macro(shstk_qt_project NAME IS_APP DOMAIN _MODULES _LIBS)
#set(QT_MULTILIB_LIST "${QT_MULTILIB_LIST}" CACHE STRING "") #set(QT_MULTILIB_LIST "${QT_MULTILIB_LIST}" CACHE STRING "")
endif() endif()
qt_target_link_libraries(${PROJECT_NAME} ${_LIBS}) qt_target_link_libraries(${PROJECT_NAME} ${_LIBS})
file(GLOB_RECURSE PHS "*_p.h")
list(REMOVE_ITEM out_HDR "${PHS}")
#message(STATUS "Building ${PROJECT_NAME}") #message(STATUS "Building ${PROJECT_NAME}")
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
set(_${NAME}_PLUGIN_LIBS "${_LIBS}") set(_${NAME}_PLUGIN_LIBS "${_LIBS}")