build: Fix merge inconsistencies
> revert no longer needed fixes > update clion configs
This commit is contained in:
@@ -761,21 +761,3 @@ set_target_properties(spicetools_spice64 spicetools_stubs_kbt64 spicetools_stubs
|
||||
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/archive64"
|
||||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/spicetools/64"
|
||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/spicetools/64")
|
||||
|
||||
# force include (temporary)
|
||||
function(target_force_include _target)
|
||||
cmake_parse_arguments(_IFORCE "" "" "QUOTE;REL_PATH;ABS_PATH" ${ARGN})
|
||||
get_target_property(_path_root ${_target} SOURCE_DIR)
|
||||
list(TRANSFORM _IFORCE_QUOTE PREPEND "SHELL:-include ")
|
||||
list(TRANSFORM _IFORCE_REL_PATH PREPEND "SHELL:-include ${_path_root}/")
|
||||
list(TRANSFORM _IFORCE_ABS_PATH PREPEND "SHELL:-include ")
|
||||
target_compile_options(${_target} PRIVATE
|
||||
${_IFORCE_QUOTE} ${_IFORCE_REL_PATH} ${_IFORCE_ABS_PATH})
|
||||
endfunction()
|
||||
target_force_include(spicetools_spice QUOTE stdint.h)
|
||||
target_force_include(spicetools_stubs_kbt QUOTE stdint.h)
|
||||
target_force_include(spicetools_stubs_kld QUOTE stdint.h)
|
||||
target_force_include(spicetools_spice64 QUOTE stdint.h)
|
||||
target_force_include(spicetools_stubs_kbt64 QUOTE stdint.h)
|
||||
target_force_include(spicetools_stubs_kld64 QUOTE stdint.h)
|
||||
target_force_include(spicetools_cfg QUOTE stdint.h)
|
||||
|
||||
Reference in New Issue
Block a user