diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-07-12 19:06:49 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-07-12 19:06:49 (GMT) |
| commit | 0f14e54f35670a6c0dc3f098fd9cdf6927a1c1eb (patch) | |
| tree | b2e74f555343eac2b3fdd83c514dfb4384513c81 | |
| parent | eee2d2b035295a04a8e00c2f187cfa786bffcdc0 (diff) | |
| download | CMake-0f14e54f35670a6c0dc3f098fd9cdf6927a1c1eb.zip CMake-0f14e54f35670a6c0dc3f098fd9cdf6927a1c1eb.tar.gz CMake-0f14e54f35670a6c0dc3f098fd9cdf6927a1c1eb.tar.bz2 | |
ENH: fixes for macosx
| -rw-r--r-- | Source/WXDialog/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Source/WXDialog/bin/FindwxWin.cmake | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/Source/WXDialog/CMakeLists.txt b/Source/WXDialog/CMakeLists.txt index 80c5212..c50dd02 100644 --- a/Source/WXDialog/CMakeLists.txt +++ b/Source/WXDialog/CMakeLists.txt @@ -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") diff --git a/Source/WXDialog/bin/FindwxWin.cmake b/Source/WXDialog/bin/FindwxWin.cmake index 67ef392..9dd9008 100644 --- a/Source/WXDialog/bin/FindwxWin.cmake +++ b/Source/WXDialog/bin/FindwxWin.cmake @@ -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 ) |