Commit 0f14e54f authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

ENH: fixes for macosx

parent eee2d2b0
......@@ -69,8 +69,11 @@ IF(WXWIDGETS_FOUND)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Source/WXDialog
${WXWIDGETS_INCLUDE_DIR})
LINK_DIRECTORIES( ${WXWIDGETS_LINK_DIRECTORIES} ${CMake_BINARY_DIR}/Source ${CMake_BINARY_DIR}/Source/kwsys )
ADD_EXECUTABLE(WXDialog WIN32 ${CMAKE_SRCS})
IF(APPLE)
ADD_EXECUTABLE(WXDialog MACOSX_BUNDLE ${CMAKE_SRCS})
ELSE(APPLE)
ADD_EXECUTABLE(WXDialog WIN32 ${CMAKE_SRCS})
ENDIF(APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_WX_CXX_FLAGS}")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D__WXDEBUG__ -DWXDEBUG=1")
......
......@@ -420,10 +420,12 @@ ELSE( WIN32 )
# just in case `gtk-config --cflags`does not work
# SET( WXWINDOWS_INCLUDE_DIR ${WXWINDOWS_INCLUDE_DIR} /usr/include/gtk-2.0 /usr/include/gtk-2.0/include /usr/lib/gtk-2.0/include /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/include/pango-1.0 /usr/include/atk-1.0 )
# What about FindGTK.cmake? and what if somebody uses wxMotif?
SET( CMAKE_WX_CXX_FLAGS "${CMAKE_WX_CXX_FLAGS} `gtk-config --cflags`" )
#find Xwindows
INCLUDE( ${CMAKE_ROOT}/Modules/FindX11.cmake )
SET( WXWINDOWS_INCLUDE_DIR ${WXWINDOWS_INCLUDE_DIR} ${X11_INCLUDE_DIR} )
IF(NOT APPLE)
SET( CMAKE_WX_CXX_FLAGS "${CMAKE_WX_CXX_FLAGS} `gtk-config --cflags`" )
#find Xwindows
INCLUDE( ${CMAKE_ROOT}/Modules/FindX11.cmake )
SET( WXWINDOWS_INCLUDE_DIR ${WXWINDOWS_INCLUDE_DIR} ${X11_INCLUDE_DIR} )
ENDIF(NOT APPLE)
ENDIF( CYGWIN OR MINGW )
ENDIF( WIN32 )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment