Merge pull request #82 from ctrlaltca/osx-compilation-fix
Fix compiling on OSX
This commit is contained in:
commit
50ac14e8ff
2 changed files with 14 additions and 3 deletions
|
@ -215,8 +215,13 @@ endif (NOT QT_QTMULTIMEDIA_FOUND)
|
|||
FIND_PACKAGE(Protobuf REQUIRED)
|
||||
FIND_PACKAGE(Threads)
|
||||
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
|
||||
IF (CMAKE_COMPILER_IS_GNUCC)
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
|
||||
ELSE (CMAKE_COMPILER_IS_GNUCC)
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-O2")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
|
||||
ENDIF (CMAKE_COMPILER_IS_GNUCC)
|
||||
|
||||
# paths
|
||||
set(ICONDIR share/icons CACHE STRING "icon dir")
|
||||
|
|
|
@ -13,7 +13,13 @@ SET(QT_USE_QTSVG TRUE)
|
|||
FIND_PACKAGE(Qt4 REQUIRED)
|
||||
|
||||
set(CMAKE_BUILD_TYPE Release)
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
|
||||
IF (CMAKE_COMPILER_IS_GNUCC)
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-s -O2")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0")
|
||||
ELSE (CMAKE_COMPILER_IS_GNUCC)
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "-O2")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
|
||||
ENDIF (CMAKE_COMPILER_IS_GNUCC)
|
||||
|
||||
QT4_WRAP_CPP(oracle_HEADERS_MOC ${oracle_HEADERS})
|
||||
INCLUDE(${QT_USE_FILE})
|
||||
|
|
Loading…
Reference in a new issue