Worked around the OS X issue for now. Let's go!
This commit is contained in:
parent
c31699e4cd
commit
cfc92c64ac
|
@ -1,9 +1,6 @@
|
||||||
# 3 june 2016
|
# 3 june 2016
|
||||||
cmake_minimum_required(VERSION 2.8.11)
|
cmake_minimum_required(VERSION 2.8.11)
|
||||||
|
|
||||||
# TODOs:
|
|
||||||
# - Darwin, Unix: static linking temporary target makes PUBLIC properties not propagate
|
|
||||||
|
|
||||||
# the docs say we need to set this up prior to project()
|
# the docs say we need to set this up prior to project()
|
||||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")
|
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")
|
||||||
|
|
||||||
|
@ -155,6 +152,14 @@ macro(_add_exec _name)
|
||||||
if(NOT BUILD_SHARED_LIBS)
|
if(NOT BUILD_SHARED_LIBS)
|
||||||
target_link_libraries(${_name} ${_LIBUI_LIBS})
|
target_link_libraries(${_name} ${_LIBUI_LIBS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# TODOfor some reason these don't propagate
|
||||||
|
if(NOT WIN32)
|
||||||
|
target_include_directories(${_name}
|
||||||
|
PUBLIC .)
|
||||||
|
target_compile_options(${_name}
|
||||||
|
PUBLIC ${_COMMON_CFLAGS})
|
||||||
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
add_subdirectory("test")
|
add_subdirectory("test")
|
||||||
add_subdirectory("examples")
|
add_subdirectory("examples")
|
||||||
|
|
Loading…
Reference in New Issue