shithub: dumb

Info  •  Files  •  Log  •  Branches

Merge pull request #10 from realistschuckle/master

Move the block for adding the Mac OS X specific properties to after the registration of the library

--- a/dumb/cmake/CMakeLists.txt

+++ b/dumb/cmake/CMakeLists.txt

@@ -7,11 +7,6 @@

 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-ffast-math -g -O2 -DNDEBUG")

 set(CMAKE_C_FLAGS_MINSIZEREL "-ffast-math -Os -DNDEBUG")

-# Make sure the dylib install name path is set on OSX so you can include dumb in app bundles

-IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

-    set_target_properties(dumb PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)

-ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

-

 link_directories(${CMAKE_CURRENT_BINARY_DIR})

 include_directories(../include/)

@@ -109,6 +104,11 @@

 add_library(dumb ${SOURCES})

 set_target_properties(dumb PROPERTIES DEBUG_POSTFIX d)

+

+# Make sure the dylib install name path is set on OSX so you can include dumb in app bundles

+IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

+    set_target_properties(dumb PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib)

+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

 INSTALL(FILES ${INSTALL_HEADERS} DESTINATION include/)

 INSTALL(TARGETS dumb