diff --git a/CMakeLists.txt b/CMakeLists.txt index 57e4dc8..c90a068 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,14 @@ cmake_minimum_required(VERSION 2.6) project(libs) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/") -if (MINGW) +if(MINGW) find_package(MinGW REQUIRED) -endif () +endif() set(LIB 1) set(USB 1) set(ICU 1) set(CRYPT 1) +set(FFTW 1) set(LIBPROJECT 1) set(PIP_LIBRARY pip) set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo") @@ -19,7 +20,7 @@ foreach(F ${PIP_FOLDERS}) endforeach(F) #message(${PIP_INCLUDES}) 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") endif() @@ -29,8 +30,8 @@ foreach(L ${LIST_LIBS}) include_directories(${L}) endforeach(L) -if (WIN32) +if(WIN32) get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/libpip.dll" DESTINATION ${QTDIR}) install(FILES "FindMinGW.cmake" DESTINATION ${CMAKE_ROOT}/Modules) -endif () +endif() diff --git a/FindMinGW.cmake b/FindMinGW.cmake index 76a3e39..a796fb7 100644 --- a/FindMinGW.cmake +++ b/FindMinGW.cmake @@ -1,22 +1,22 @@ -if (${MINGW}) -if (NOT DEFINED MINGW_DIR) - get_filename_component(MINGW_BIN ${CMAKE_C_COMPILER} PATH) - get_filename_component(MINGW_DIR ${MINGW_BIN} PATH) - find_path(MINGW_INCLUDE - windows.h - PATHS - EVN INCLUDE - ${MINGW_DIR} - ${MINGW_DIR}/i686-w64-mingw32 - ${MINGW_DIR}/x86_64-w64-mingw32 - PATH_SUFFIXES - include) - #message(STATUS "Find MinGW = ${MINGW_INCLUDE}") - #if(NOT ${MINGW_INCLUDE}) MINGW_INCLUDE = ${MINGW_DIR}/include - find_library(MINGW_LIB m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib) - get_filename_component(MINGW_LIB ${MINGW_LIB} PATH) - message(STATUS "Find MinGW binary path = ${MINGW_BIN}") - message(STATUS "Find MinGW include path = ${MINGW_INCLUDE}") - message(STATUS "Find MinGW library path = ${MINGW_LIB}") -endif () -endif (${MINGW}) +if(${MINGW}) + if(NOT DEFINED MINGW_DIR) + get_filename_component(MINGW_BIN ${CMAKE_C_COMPILER} PATH) + get_filename_component(MINGW_DIR ${MINGW_BIN} PATH) + find_path(MINGW_INCLUDE + windows.h + PATHS + EVN INCLUDE + ${MINGW_DIR} + ${MINGW_DIR}/i686-w64-mingw32 + ${MINGW_DIR}/x86_64-w64-mingw32 + PATH_SUFFIXES + include) + #message(STATUS "Find MinGW = ${MINGW_INCLUDE}") + #if(NOT ${MINGW_INCLUDE}) MINGW_INCLUDE = ${MINGW_DIR}/include + find_library(MINGW_LIB m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib) + get_filename_component(MINGW_LIB ${MINGW_LIB} PATH) + message(STATUS "Find MinGW binary path = ${MINGW_BIN}") + message(STATUS "Find MinGW include path = ${MINGW_INCLUDE}") + message(STATUS "Find MinGW library path = ${MINGW_LIB}") + endif() +endif(${MINGW})