Форматирование

This commit is contained in:
Andrei Astafev 2021-06-23 01:30:10 +03:00
parent 4487851535
commit 253bcbedb2
2 changed files with 55 additions and 28 deletions

View File

@ -1,21 +1,37 @@
set(MYXLIB_PREFIX "" CACHE PATH "The path to the previx of an myxlib installation") if(NOT MYXLIB_PREFIX STREQUAL CMAKE_BINARY_DIR)
set(MYXLIB_PREFIX
""
CACHE PATH "The path to the previx of an myxlib installation")
find_path(MYXLIB_INCLUDE_DIRS NAMES myx/core/config.hpp PATHS ${MYXLIB_PREFIX}/include) find_path(
find_library(MYXLIB_QT_LIBRARY NAMES myx-qt PATHS ${MYXLIB_PREFIX}/lib) MYXLIB_INCLUDE_DIRS
find_library(MYXLIB_FILESYSTEM_LIBRARY NAMES myx-filesystem PATHS ${MYXLIB_PREFIX}/lib) NAMES myx/core/config.hpp
PATHS ${MYXLIB_PREFIX}/include)
find_library(
MYXLIB_QT_LIBRARY
NAMES myx-qt
PATHS ${MYXLIB_PREFIX}/lib)
find_library(
MYXLIB_FILESYSTEM_LIBRARY
NAMES myx-filesystem
PATHS ${MYXLIB_PREFIX}/lib)
if(MYXLIB_INCLUDE_DIRS AND MYXLIB_QT_LIBRARY AND MYXLIB_FILESYSTEM_LIBRARY) if(MYXLIB_INCLUDE_DIRS
get_filename_component(MYXLIB_LIBRARY_DIR ${MYXLIB_QT_LIBRARY} DIRECTORY CACHE) AND MYXLIB_QT_LIBRARY
AND MYXLIB_FILESYSTEM_LIBRARY)
get_filename_component(MYXLIB_LIBRARY_DIR ${MYXLIB_QT_LIBRARY} DIRECTORY
CACHE)
set(MYXLIB_FOUND TRUE) set(MYXLIB_FOUND TRUE)
endif() endif()
if(MYXLIB_FOUND) if(MYXLIB_FOUND)
if(NOT MYXLIB_FIND_QUIETLY) if(NOT MYXLIB_FIND_QUIETLY)
MESSAGE(STATUS "Found myxlib") message(STATUS "Found myxlib")
endif() endif()
set(HAVE_MYXLIB 1) set(HAVE_MYXLIB 1)
elseif(MYXLIB_FOUND) elseif(MYXLIB_FOUND)
if(MYXLIB_FIND_REQUIRED) if(MYXLIB_FIND_REQUIRED)
message(FATAL_ERROR "Could not find myxlib") message(FATAL_ERROR "Could not find myxlib")
endif() endif()
endif()
endif() endif()

View File

@ -6,12 +6,23 @@ ExternalProject_Add(
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib
INSTALL_DIR ${CMAKE_BINARY_DIR} INSTALL_DIR ${CMAKE_BINARY_DIR}
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR} ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <SOURCE_DIR> CONFIGURE_COMMAND
BUILD_COMMAND true ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" -DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR}
) ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <SOURCE_DIR>
BUILD_COMMAND true)
set(MYXLIB_PREFIX ${CMAKE_BINARY_DIR} CACHE FILEPATH "" FORCE) set(MYXLIB_PREFIX
set(MYXLIB_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "" FORCE) ${CMAKE_BINARY_DIR}
set(MYXLIB_LIBRARY_DIR ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} CACHE PATH "" FORCE) CACHE FILEPATH "" FORCE)
set(MYXLIB_QT_LIBRARY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a CACHE FILEPATH "" FORCE) set(MYXLIB_INCLUDE_DIRS
set(MYXLIB_FILESYSTEM_LIBRARY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a CACHE FILEPATH "" FORCE) ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
CACHE PATH "" FORCE)
set(MYXLIB_LIBRARY_DIR
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
CACHE PATH "" FORCE)
set(MYXLIB_QT_LIBRARY
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a
CACHE FILEPATH "" FORCE)
set(MYXLIB_FILESYSTEM_LIBRARY
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a
CACHE FILEPATH "" FORCE)