kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fixes for macosx

Browse Source
This commit is contained in:
Andy Cedilnik 2005-07-12 15:06:49 -04:00
parent eee2d2b035
commit 0f14e54f35
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/WXDialog/CMakeLists.txt
View File

@ -69,8 +69,11 @@ IF(WXWIDGETS_FOUND)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Source/WXDialog INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Source/WXDialog
${WXWIDGETS_INCLUDE_DIR}) ${WXWIDGETS_INCLUDE_DIR})
LINK_DIRECTORIES( ${WXWIDGETS_LINK_DIRECTORIES} ${CMake_BINARY_DIR}/Source ${CMake_BINARY_DIR}/Source/kwsys ) LINK_DIRECTORIES( ${WXWIDGETS_LINK_DIRECTORIES} ${CMake_BINARY_DIR}/Source ${CMake_BINARY_DIR}/Source/kwsys )
IF(APPLE)
ADD_EXECUTABLE(WXDialog WIN32 ${CMAKE_SRCS}) 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 "${CMAKE_WX_CXX_FLAGS}")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D__WXDEBUG__ -DWXDEBUG=1") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D__WXDEBUG__ -DWXDEBUG=1")

10
Source/WXDialog/bin/FindwxWin.cmake
View File

@ -420,10 +420,12 @@ ELSE( WIN32 )
# just in case `gtk-config --cflags`does not work # 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 ) # 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? # What about FindGTK.cmake? and what if somebody uses wxMotif?
SET( CMAKE_WX_CXX_FLAGS "${CMAKE_WX_CXX_FLAGS} `gtk-config --cflags`" ) IF(NOT APPLE)
#find Xwindows SET( CMAKE_WX_CXX_FLAGS "${CMAKE_WX_CXX_FLAGS} `gtk-config --cflags`" )
INCLUDE( ${CMAKE_ROOT}/Modules/FindX11.cmake ) #find Xwindows
SET( WXWINDOWS_INCLUDE_DIR ${WXWINDOWS_INCLUDE_DIR} ${X11_INCLUDE_DIR} ) INCLUDE( ${CMAKE_ROOT}/Modules/FindX11.cmake )
SET( WXWINDOWS_INCLUDE_DIR ${WXWINDOWS_INCLUDE_DIR} ${X11_INCLUDE_DIR} )
ENDIF(NOT APPLE)
ENDIF( CYGWIN OR MINGW ) ENDIF( CYGWIN OR MINGW )
ENDIF( WIN32 ) ENDIF( WIN32 )