nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

cmake: avoid passing around CFLAGS

Browse Source
This commit is contained in:
Danny Robson 2017-01-23 21:48:44 +11:00
parent d1fe677977
commit f665244010
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -88,7 +88,7 @@ search_libs (DL_LIBS dlopen dl)
search_libs (CLOCK_LIB clock_gettime rt c) search_libs (CLOCK_LIB clock_gettime rt c)
search_libs (MATH_LIB cos m) search_libs (MATH_LIB cos m)
list (APPEND LIBS ${SHM_LIIBS} ${DL_LIBS} ${CLOCK_LIB} ${MATH_LIB}) list (APPEND LIBS ${SHM_LIBS} ${DL_LIBS} ${CLOCK_LIB} ${MATH_LIB})
############################################################################### ###############################################################################
@ -102,6 +102,7 @@ list (
posix/fd.hpp posix/fd.hpp
) )
if (NOT WINDOWS) if (NOT WINDOWS)
list ( list (
APPEND UTIL_FILES APPEND UTIL_FILES
@ -418,22 +419,14 @@ list (
############################################################################### ###############################################################################
add_library(cruft-util ${UTIL_FILES}) add_library(cruft-util ${UTIL_FILES})
target_link_libraries (cruft-util ${LIBS})
###############################################################################
set (LIBS "cruft-util;${LIBS}")
get_directory_property(HAS_PARENT PARENT_DIRECTORY)
if (HAS_PARENT)
set (CRUFT_UTIL_LIBS ${LIBS} PARENT_SCOPE)
endif ()
############################################################################### ###############################################################################
foreach (tool hash json-clean json-schema json-validate scratch) foreach (tool hash json-clean json-schema json-validate scratch)
add_executable (util_${tool} tools/${tool}.cpp) add_executable (util_${tool} tools/${tool}.cpp)
set_target_properties (util_${tool} PROPERTIES OUTPUT_NAME ${tool}) set_target_properties (util_${tool} PROPERTIES OUTPUT_NAME ${tool})
target_link_libraries (util_${tool} ${LIBS}) target_link_libraries (util_${tool} cruft-util)
endforeach () endforeach ()
@ -448,5 +441,12 @@ endif ()
############################################################################### ###############################################################################
get_directory_property (HAS_PARENT PARENT_DIRECTORY)
if (HAS_PARENT)
set (CRUFT_UTIL_FOUND 1 PARENT_SCOPE)
endif ()
##-----------------------------------------------------------------------------
configure_file(libcruft-util-system.pc.in libcruft-util.pc) configure_file(libcruft-util-system.pc.in libcruft-util.pc)
configure_file(Doxyfile.in Doxyfile) configure_file(Doxyfile.in Doxyfile)

2
cmake

@ -1 +1 @@
Subproject commit 2d9f884cbc3d2312582fd8009712264855e3f0b7 Subproject commit 7df08f681817fec591dd77f7be23eff5c6778aaa