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

git-svn-id: svn://db.shs.com.ru/libs@178 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-14 09:31:10 +00:00
parent ef0965d283
commit 652e912714
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@@ -1,13 +1,14 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(libs) project(libs)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/") set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
if (MINGW) if(MINGW)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
endif () endif()
set(LIB 1) set(LIB 1)
set(USB 1) set(USB 1)
set(ICU 1) set(ICU 1)
set(CRYPT 1) set(CRYPT 1)
set(FFTW 1)
set(LIBPROJECT 1) set(LIBPROJECT 1)
set(PIP_LIBRARY pip) set(PIP_LIBRARY pip)
set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo") set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo")
@@ -19,7 +20,7 @@ foreach(F ${PIP_FOLDERS})
endforeach(F) endforeach(F)
#message(${PIP_INCLUDES}) #message(${PIP_INCLUDES})
set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg") set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg")
if (WIN32) if(WIN32)
set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip") set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip")
endif() endif()
@@ -29,8 +30,8 @@ foreach(L ${LIST_LIBS})
include_directories(${L}) include_directories(${L})
endforeach(L) endforeach(L)
if (WIN32) if(WIN32)
get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/libpip.dll" DESTINATION ${QTDIR}) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/libpip.dll" DESTINATION ${QTDIR})
install(FILES "FindMinGW.cmake" DESTINATION ${CMAKE_ROOT}/Modules) install(FILES "FindMinGW.cmake" DESTINATION ${CMAKE_ROOT}/Modules)
endif () endif()

44
FindMinGW.cmake
View File

@@ -1,22 +1,22 @@
if (${MINGW}) if(${MINGW})
if (NOT DEFINED MINGW_DIR) if(NOT DEFINED MINGW_DIR)
get_filename_component(MINGW_BIN ${CMAKE_C_COMPILER} PATH) get_filename_component(MINGW_BIN ${CMAKE_C_COMPILER} PATH)
get_filename_component(MINGW_DIR ${MINGW_BIN} PATH) get_filename_component(MINGW_DIR ${MINGW_BIN} PATH)
find_path(MINGW_INCLUDE find_path(MINGW_INCLUDE
windows.h windows.h
PATHS PATHS
EVN INCLUDE EVN INCLUDE
${MINGW_DIR} ${MINGW_DIR}
${MINGW_DIR}/i686-w64-mingw32 ${MINGW_DIR}/i686-w64-mingw32
${MINGW_DIR}/x86_64-w64-mingw32 ${MINGW_DIR}/x86_64-w64-mingw32
PATH_SUFFIXES PATH_SUFFIXES
include) include)
#message(STATUS "Find MinGW = ${MINGW_INCLUDE}") #message(STATUS "Find MinGW = ${MINGW_INCLUDE}")
#if(NOT ${MINGW_INCLUDE}) MINGW_INCLUDE = ${MINGW_DIR}/include #if(NOT ${MINGW_INCLUDE}) MINGW_INCLUDE = ${MINGW_DIR}/include
find_library(MINGW_LIB m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib) find_library(MINGW_LIB m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib)
get_filename_component(MINGW_LIB ${MINGW_LIB} PATH) get_filename_component(MINGW_LIB ${MINGW_LIB} PATH)
message(STATUS "Find MinGW binary path = ${MINGW_BIN}") message(STATUS "Find MinGW binary path = ${MINGW_BIN}")
message(STATUS "Find MinGW include path = ${MINGW_INCLUDE}") message(STATUS "Find MinGW include path = ${MINGW_INCLUDE}")
message(STATUS "Find MinGW library path = ${MINGW_LIB}") message(STATUS "Find MinGW library path = ${MINGW_LIB}")
endif () endif()
endif (${MINGW}) endif(${MINGW})