diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-03-07 01:11:21 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-03-07 01:11:21 +0100 |
| commit | d241a49ec83d8a146ceddca44b1281c7e4c9da50 (patch) | |
| tree | d31e95887ebabf85a06c7ccddcba773d30f96d97 /cmake | |
| parent | 1ab1d2c72315c03bf10c5c78bb6b3b674926039f (diff) | |
| parent | 69005c7e0295b1b6f39e7d3f3d9d2911a31e246c (diff) | |
Merge branch 'unstable' into trackhattrackhat-1.2p1
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mingw-w64.cmake | 22 | ||||
| -rw-r--r-- | cmake/opentrack-qt.cmake | 8 | ||||
| -rw-r--r-- | cmake/opentrack-tarball.cmake | 2 |
3 files changed, 18 insertions, 14 deletions
diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake index 679f67de..7d097422 100644 --- a/cmake/mingw-w64.cmake +++ b/cmake/mingw-w64.cmake @@ -7,15 +7,19 @@ SET(CMAKE_SYSTEM_NAME Windows) SET(CMAKE_SYSTEM_VERSION 1) # specify the cross compiler -set(c /c/mingw-w64/i686-5.2.0-posix-sjlj-rt_v4-rev0/mingw32/bin/i686-w64-mingw32-) - -SET(CMAKE_C_COMPILER ${c}gcc) -SET(CMAKE_CXX_COMPILER ${c}g++) -set(CMAKE_RC_COMPILER ${c}windres) -set(CMAKE_LINKER ${c}ld) -set(CMAKE_AR ${c}gcc-ar CACHE STRING "" FORCE) -set(CMAKE_NM ${c}gcc-nm CACHE STRING "" FORCE) -set(CMAKE_RANLIB ${c}gcc-ranlib CACHE STRING "" FORCE) +set(p c:/mingw-w64/i686-5.3.0-posix-dwarf-rt_v4-rev0/mingw32/bin) +set(c ${p}/i686-w64-mingw32-) +set(CMAKE_MAKE_PROGRAM ${p}/mingw32-make.exe CACHE FILEPATH "" FORCE) + +set(e .exe) + +SET(CMAKE_C_COMPILER ${c}gcc${e}) +SET(CMAKE_CXX_COMPILER ${c}g++${e}) +set(CMAKE_RC_COMPILER ${c}windres${e}) +set(CMAKE_LINKER ${c}ld${e}) +set(CMAKE_AR ${c}gcc-ar${e} CACHE STRING "" FORCE) +set(CMAKE_NM ${c}gcc-nm${e} CACHE STRING "" FORCE) +set(CMAKE_RANLIB ${c}gcc-ranlib${e} CACHE STRING "" FORCE) SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32) diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index 12966827..65ec75fd 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -1,5 +1,5 @@ -find_package(Qt5 REQUIRED COMPONENTS Core Xml Network Widgets Gui QUIET) +find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Gui QUIET) find_package(Qt5 COMPONENTS SerialPort QUIET) -include_directories(SYSTEM ${Qt5Core_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) -add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Xml_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}) -set(MY_QT_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Xml_LIBRARIES}) +include_directories(SYSTEM ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) +add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}) +set(MY_QT_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES}) diff --git a/cmake/opentrack-tarball.cmake b/cmake/opentrack-tarball.cmake index f26052f3..1f292af7 100644 --- a/cmake/opentrack-tarball.cmake +++ b/cmake/opentrack-tarball.cmake @@ -20,7 +20,7 @@ add_custom_target(tarball-real) add_custom_target(tarball-real2) add_custom_command(TARGET tarball-real COMMAND cmake -P ${CMAKE_SOURCE_DIR}/cmake/tarball.cmake) -add_custom_command(TARGET tarball-real2 COMMAND /usr/bin/env sh +add_custom_command(TARGET tarball-real2 COMMAND sh "${CMAKE_SOURCE_DIR}/make-tar.sh" "${CMAKE_INSTALL_PREFIX}" "${filename}" "${CMAKE_BINARY_DIR}") add_custom_target(tarball DEPENDS tarball-real) |