X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Ftools%2FCMakeLists.txt;h=7a05fce1bd43080ead2d35e294e917b2a5d28a06;hp=a34ec6773d5a5764982e2b1504a03b4107e09493;hb=ce18438e729e6c11eebd3a5fb73f4039fdda33a0;hpb=26d19ed9ed27c5775dc9033ab2afe5983eb34619

diff --git a/source/tools/CMakeLists.txt b/source/tools/CMakeLists.txt
index a34ec67..7a05fce 100644
--- a/source/tools/CMakeLists.txt
+++ b/source/tools/CMakeLists.txt
@@ -1,16 +1,32 @@
 add_executable(bitmapcode
     bitmapcode.cpp)
-    
+
 if (MSVC)
-add_custom_command(
-    TARGET bitmapcode
-    POST_BUILD
-    COMMAND $(OutDir)/bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+    target_link_libraries(bitmapcode
+        LINK_PUBLIC
+        ${wxWidgets_LIBRARIES})
+    add_custom_command(
+        TARGET bitmapcode
+        POST_BUILD
+        COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+elseif (APPLE)
+    target_link_libraries(bitmapcode
+        LINK_PUBLIC
+        c++
+        ${wxWidgets_LIBRARIES})
+    add_custom_command(
+        TARGET bitmapcode
+        POST_BUILD
+        COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
+else()
+    target_link_libraries(bitmapcode
+        LINK_PUBLIC
+        ${wxWidgets_LIBRARIES})
+    add_custom_command(
+        TARGET bitmapcode
+        POST_BUILD
+        COMMAND bitmapcode ${CMAKE_SOURCE_DIR}/bitmaps)
 endif()
-    
-target_link_libraries(bitmapcode
-    LINK_PUBLIC
-    ${wxWidgets_LIBRARIES})
 
 set (sources 
     odthelpbrowser/base64.cpp
@@ -26,6 +42,8 @@ set (sources
 
 if (WIN32)
     add_executable(odthelpbrowser WIN32 ${sources})
+elseif (APPLE)
+    add_executable(odthelpbrowser MACOSX_BUNDLE ${sources})
 else()
     add_executable(odthelpbrowser ${sources})
 endif()