X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftools%2FCMakeLists.txt;h=fb9e8b8023a21257df2aa10c54634f32700c91f7;hb=0d97425fcb83c04a0db5558b6e793fbc2372726e;hp=8de8c5a12b2d48709d808ed8133b29d3f86138fb;hpb=ea5f276a69989d4e5797b49083322bac2c9a820c;p=xestiaab%2F.git

diff --git a/source/tools/CMakeLists.txt b/source/tools/CMakeLists.txt
index 8de8c5a..fb9e8b8 100644
--- a/source/tools/CMakeLists.txt
+++ b/source/tools/CMakeLists.txt
@@ -1,16 +1,25 @@
 add_executable(bitmapcode
     bitmapcode.cpp)
-    
-add_custom_command(
-    TARGET bitmapcode
-    POST_BUILD
-    COMMAND ${CMAKE_BINARY_DIR}/tools/bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
-    
-target_link_libraries(bitmapcode
-    LINK_PUBLIC
-    ${wxWidgets_LIBRARIES})
 
-add_executable(odthelpbrowser
+if (MSVC)
+    add_custom_command(
+        TARGET bitmapcode
+        POST_BUILD
+        COMMAND $(OutDir)/bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+endif()
+
+if (APPLE)
+    target_link_libraries(bitmapcode
+        LINK_PUBLIC
+        c++
+        ${wxWidgets_LIBRARIES})
+else()
+    target_link_libraries(bitmapcode
+        LINK_PUBLIC
+        ${wxWidgets_LIBRARIES})
+endif()
+
+set (sources 
     odthelpbrowser/base64.cpp
     odthelpbrowser/base64.h
     odthelpbrowser/frmMain.cpp
@@ -21,8 +30,16 @@ add_executable(odthelpbrowser
     odthelpbrowser/ODTHelpBrowser.cpp
     odthelpbrowser/ODTHelpBrowser.h
     odthelpbrowser/version.h)
+
+if (WIN32)
+    add_executable(odthelpbrowser WIN32 ${sources})
+elseif (APPLE)
+    add_executable(odthelpbrowser MACOSX_BUNDLE ${sources})
+else()
+    add_executable(odthelpbrowser ${sources})
+endif()
     
 target_link_libraries(odthelpbrowser
     LINK_PUBLIC
     ${wxWidgets_LIBRARIES}
-    ${LIBXML2_LIBRARY})
\ No newline at end of file
+    ${LIBXML2_LIBRARY})