Mercurial > mxe-octave
comparison Makefile.in @ 3146:d468ce1eb636
[MSVC] fix cmake for use with clgcc/clg++
- adapt toolchain file (avoid making cmake think it's cross-compiling)
- patch cmake to prevent using link library prefix (-l) and suffix (.lib)
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Wed, 17 Jul 2013 10:04:30 -0400 |
parents | a2afd94e919f |
children | e0beeba4490f |
comparison
equal
deleted
inserted
replaced
3145:fae248a5b181 | 3146:d468ce1eb636 |
---|---|
549 ) | 549 ) |
550 | 550 |
551 define build-cmake-toolchain-file | 551 define build-cmake-toolchain-file |
552 # create the CMake toolchain file | 552 # create the CMake toolchain file |
553 [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' | 553 [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' |
554 (if [ $(MXE_SYSTEM) = mingw -o $(MXE_SYSTEM) = msvc ]; then \ | 554 (if [ $(MXE_SYSTEM) = mingw ]; then \ |
555 echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ | 555 echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ |
556 echo 'set(MSYS 1)'; \ | 556 echo 'set(MSYS 1)'; \ |
557 fi; \ | |
558 if [ $(MXE_SYSTEM) = msvc ]; then \ | |
559 echo 'set(MSVC 1)'; \ | |
557 fi; \ | 560 fi; \ |
558 if [ $(BUILD_SHARED) = yes ]; then \ | 561 if [ $(BUILD_SHARED) = yes ]; then \ |
559 echo 'set(BUILD_SHARED_LIBS ON)'; \ | 562 echo 'set(BUILD_SHARED_LIBS ON)'; \ |
560 else \ | 563 else \ |
561 echo 'set(BUILD_SHARED_LIBS OFF)'; \ | 564 echo 'set(BUILD_SHARED_LIBS OFF)'; \ |
564 echo 'set(BUILD_STATIC_LIBS ON)'; \ | 567 echo 'set(BUILD_STATIC_LIBS ON)'; \ |
565 else \ | 568 else \ |
566 echo 'set(BUILD_STATIC_LIBS OFF)'; \ | 569 echo 'set(BUILD_STATIC_LIBS OFF)'; \ |
567 fi; \ | 570 fi; \ |
568 echo 'set(CMAKE_BUILD_TYPE Release)'; \ | 571 echo 'set(CMAKE_BUILD_TYPE Release)'; \ |
569 echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX))'; \ | 572 if [ $(MXE_SYSTEM) = msvc ]; then \ |
570 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ | 573 echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX_NATIVE))'; \ |
574 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)'; \ | |
575 else \ | |
576 echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX))'; \ | |
577 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ | |
578 fi; \ | |
571 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ | 579 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ |
572 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ | 580 echo 'set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)'; \ |
573 echo 'set(CMAKE_C_COMPILER $(MXE_CC))'; \ | 581 echo 'set(CMAKE_C_COMPILER $(MXE_CC))'; \ |
574 echo 'set(CMAKE_CXX_COMPILER $(MXE_CXX))'; \ | 582 echo 'set(CMAKE_CXX_COMPILER $(MXE_CXX))'; \ |
575 echo 'set(CMAKE_Fortran_COMPILER $(MXE_F77))'; \ | 583 echo 'set(CMAKE_Fortran_COMPILER $(MXE_F77))'; \ |
576 echo 'set(CMAKE_RC_COMPILER $(MXE_WINDRES))'; \ | 584 echo 'set(CMAKE_RC_COMPILER $(MXE_WINDRES))'; \ |
577 echo 'set(PKG_CONFIG_EXECUTABLE $(MXE_PKG_CONFIG))'; \ | 585 echo 'set(PKG_CONFIG_EXECUTABLE $(MXE_PKG_CONFIG))'; \ |
578 echo 'set(QT_QMAKE_EXECUTABLE $(MXE_QMAKE))'; \ | 586 echo 'set(QT_QMAKE_EXECUTABLE $(MXE_QMAKE))'; \ |
579 echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \ | 587 if [ $(MXE_SYSTEM) = msvc ]; then \ |
588 echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX_NATIVE) CACHE PATH "Installation Prefix")'; \ | |
589 else \ | |
590 echo 'set(CMAKE_INSTALL_PREFIX $(HOST_PREFIX) CACHE PATH "Installation Prefix")'; \ | |
591 fi; \ | |
580 echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ | 592 echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ |
581 > '$(CMAKE_TOOLCHAIN_FILE)' | 593 > '$(CMAKE_TOOLCHAIN_FILE)' |
582 endef | 594 endef |
583 | 595 |
584 cmake-toolchain-file.stamp: | 596 cmake-toolchain-file.stamp: |