Changeset eb0481b in tol


Ignore:
Timestamp:
Jan 12, 2016, 1:09:14 PM (11 years ago)
Author:
Pedro Gea <pgea@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
9d6a77b
Parents:
171e6a0
Message:

Refs #1910
Se revisan las opciones de compilación y se incoporpora en CMAKE_SHARED_LINKER_FLAGS las necesarias para la librería de vbtol.
Véase: ​http://www.mingw.org/wiki/Visual_Basic_DLL

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7189 be4846ae-f051-483a-831f-b64e7d08527f

Location:
tol/cmake
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • tol/cmake/mingw-m32.toolchain.cmake

    r171e6a0 reb0481b  
    11set(CMAKE_SYSTEM_NAME Windows)
    22
    3 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -mno-align-double" CACHE STRING "c++ flags" )
    4 set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -m32 -mno-align-double" CACHE STRING "c flags" )
    5 set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb" CACHE STRING "c++ flags in Debug" )
    6 set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb" CACHE STRING "c flags in Debug" )
    7 set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG  -O2" CACHE STRING "c++ flags in Release" )
    8 set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -O2" CACHE STRING "c flags in Release" )
    9 set( LINKER_SHARED_FLAGS "${LINKER_SHARED_FLAGS} -m32" CACHE STRING "linker flags" )
     3set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -m32 -mno-align-double" CACHE STRING "c++ flags")
     4set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -m32 -mno-align-double"   CACHE STRING "c flags")
     5set(CMAKE_CXX_FLAGS_DEBUG     "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb"        CACHE STRING "c++ flags in Debug")
     6set(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb"          CACHE STRING "c flags in Debug")
     7set(CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -O2"   CACHE STRING "c++ flags in Release")
     8set(CMAKE_C_FLAGS_RELEASE     "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -O2"     CACHE STRING "c flags in Release")
     9set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32 -Wl,--add-stdcall-alias -Wl,--enable-stdcall-fixup" CACHE STRING "linker flags")

  • tol/cmake/mingw-m64-O3-mtune_native.toolchain.cmake

    r171e6a0 reb0481b  
    11set(CMAKE_SYSTEM_NAME Windows)
    22
    3 set( CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -m64 -mno-align-double"                 CACHE STRING "c++ flags" )
    4 set( CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -m64 -mno-align-double"                   CACHE STRING "c flags" )
    5 set( CMAKE_CXX_FLAGS_DEBUG     "${CMAKE_CXX_FLAGS_DEBUG} -m64 -O0 -ggdb -mno-align-double" CACHE STRING "c++ flags in Debug" )
    6 set( CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -m64 -O0 -ggdb -mno-align-double"   CACHE STRING "c flags in Debug" )
    7 set( CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -m64 -O3 -mtune=native -mno-align-double -DNDEBUG"     CACHE STRING "c++ flags in Release" )
    8 set( CMAKE_C_FLAGS_RELEASE     "${CMAKE_C_FLAGS_RELEASE} -m64 -O3 -mtune=native -mno-align-double -DNDEBUG"       CACHE STRING "c flags in Release" )
    9 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m64"                         CACHE STRING "linker flags" )
     3set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -m64 -mno-align-double"                 CACHE STRING "c++ flags")
     4set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -m64 -mno-align-double"                   CACHE STRING "c flags")
     5set(CMAKE_CXX_FLAGS_DEBUG     "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb"                        CACHE STRING "c++ flags in Debug")
     6set(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb"                          CACHE STRING "c flags in Debug")
     7set(CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -O3 -mtune=native -DNDEBUG"     CACHE STRING "c++ flags in Release")
     8set(CMAKE_C_FLAGS_RELEASE     "${CMAKE_C_FLAGS_RELEASE} -O3 -mtune=native -DNDEBUG"       CACHE STRING "c flags in Release")
     9set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m64 -Wl,--add-stdcall-alias" CACHE STRING "linker flags")

  • tol/cmake/mingw-m64-Ofast-mtune_native.toolchain.cmake

    r171e6a0 reb0481b  
    11set(CMAKE_SYSTEM_NAME Windows)
    22
    3 set( CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -m64 -mno-align-double"                 CACHE STRING "c++ flags" )
    4 set( CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -m64 -mno-align-double"                   CACHE STRING "c flags" )
    5 set( CMAKE_CXX_FLAGS_DEBUG     "${CMAKE_CXX_FLAGS_DEBUG} -m64 -O0 -ggdb -mno-align-double" CACHE STRING "c++ flags in Debug" )
    6 set( CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -m64 -O0 -ggdb -mno-align-double"   CACHE STRING "c flags in Debug" )
    7 set( CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -m64 -Ofast -mtune=native -mno-align-double -DNDEBUG"     CACHE STRING "c++ flags in Release" )
    8 set( CMAKE_C_FLAGS_RELEASE     "${CMAKE_C_FLAGS_RELEASE} -m64 -Ofast -mtune=native -mno-align-double -DNDEBUG"       CACHE STRING "c flags in Release" )
    9 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m64"                         CACHE STRING "linker flags" )
     3set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -m64 -mno-align-double"                 CACHE STRING "c++ flags")
     4set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -m64 -mno-align-double"                   CACHE STRING "c flags")
     5set(CMAKE_CXX_FLAGS_DEBUG     "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb"                        CACHE STRING "c++ flags in Debug")
     6set(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb"                          CACHE STRING "c flags in Debug")
     7set(CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -mtune=native -DNDEBUG"  CACHE STRING "c++ flags in Release")
     8set(CMAKE_C_FLAGS_RELEASE     "${CMAKE_C_FLAGS_RELEASE} -Ofast -mtune=native -DNDEBUG"    CACHE STRING "c flags in Release")
     9set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m64 -Wl,--add-stdcall-alias" CACHE STRING "linker flags")

  • tol/cmake/mingw-m64.toolchain.cmake

    r171e6a0 reb0481b  
    11set(CMAKE_SYSTEM_NAME Windows)
    22
    3 set( CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -m64 -mno-align-double"                 CACHE STRING "c++ flags" )
    4 set( CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -m64 -mno-align-double"                   CACHE STRING "c flags" )
    5 set( CMAKE_CXX_FLAGS_DEBUG     "${CMAKE_CXX_FLAGS_DEBUG} -m64 -O0 -ggdb -mno-align-double" CACHE STRING "c++ flags in Debug" )
    6 set( CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -m64 -O0 -ggdb -mno-align-double"   CACHE STRING "c flags in Debug" )
    7 set( CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -m64 -O2 -mno-align-double -DNDEBUG"     CACHE STRING "c++ flags in Release" )
    8 set( CMAKE_C_FLAGS_RELEASE     "${CMAKE_C_FLAGS_RELEASE} -m64 -O2 -mno-align-double -DNDEBUG"       CACHE STRING "c flags in Release" )
    9 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m64"                         CACHE STRING "linker flags" )
     3set(CMAKE_CXX_FLAGS           "${CMAKE_CXX_FLAGS} -m64 -mno-align-double"                 CACHE STRING "c++ flags")
     4set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -m64 -mno-align-double"                   CACHE STRING "c flags")
     5set(CMAKE_CXX_FLAGS_DEBUG     "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb"                        CACHE STRING "c++ flags in Debug")
     6set(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb"                          CACHE STRING "c flags in Debug")
     7set(CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -O2 -DNDEBUG"                   CACHE STRING "c++ flags in Release")
     8set(CMAKE_C_FLAGS_RELEASE     "${CMAKE_C_FLAGS_RELEASE} -O2 -DNDEBUG"                     CACHE STRING "c flags in Release")
     9set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m64 -Wl,--add-stdcall-alias" CACHE STRING "linker flags")
Note: See TracChangeset for help on using the changeset viewer.