Skip to content
This repository has been archived by the owner on Oct 15, 2024. It is now read-only.

Commit

Permalink
reformat cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
mpranj committed Jun 5, 2021
1 parent 98205bd commit d285169
Show file tree
Hide file tree
Showing 47 changed files with 191 additions and 137 deletions.
3 changes: 1 addition & 2 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ if (DOXYGEN_FOUND)
add_custom_command (
OUTPUT ${DOCSET_PATH}
COMMAND make
COMMAND
${CMAKE_COMMAND} ARGS -D DOCSET_PATH=${DOCSET_PATH} -D ICON_PATH=${CMAKE_SOURCE_DIR}/doc/images/icon.png -P
COMMAND ${CMAKE_COMMAND} ARGS -D DOCSET_PATH=${DOCSET_PATH} -D ICON_PATH=${CMAKE_SOURCE_DIR}/doc/images/icon.png -P
${CMAKE_SOURCE_DIR}/scripts/cmake/ElektraDocSet.cmake
DEPENDS ${OUTPUT_DIRECTORY}/html/index.html markdownlinkconverter
WORKING_DIRECTORY ${OUTPUT_DIRECTORY}/html)
Expand Down
2 changes: 1 addition & 1 deletion scripts/cmake/ElektraCompiling.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ else (ELEKTRA_SYMVER_SUPPORTED)
set (ELEKTRA_SYMVER_COMMAND "")

try_compile (ELEKTRA_VERSION_SCRIPT_SUPPORTED ${CMAKE_BINARY_DIR}/src/symvertest/build ${CMAKE_SOURCE_DIR}/src/symvertest
symvertest basic)
symvertest basic)
if (ELEKTRA_VERSION_SCRIPT_SUPPORTED)
set (LD_ACCEPTS_VERSION_SCRIPT TRUE)
else (ELEKTRA_VERSION_SCRIPT_SUPPORTED)
Expand Down
12 changes: 4 additions & 8 deletions scripts/cmake/ElektraCoverage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,14 @@ if (EXISTS ${COVERAGE_LCOV} AND EXISTS ${COVERAGE_AWK})
add_custom_target (
coverage-start
COMMAND ${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --zerocounters
COMMAND
${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --initial --capture --output-file ${COVERAGE_DIR}/coverage-base.info
COMMAND ${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --initial --capture --output-file ${COVERAGE_DIR}/coverage-base.info
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
COMMENT "Start capturing data for coverage.")

add_custom_target (
coverage-stop
COMMAND
${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --capture --output-file ${COVERAGE_DIR}/coverage-test.info
COMMAND
${COVERAGE_LCOV} ${COMMON_FLAGS} --add-tracefile ${COVERAGE_DIR}/coverage-test.info --add-tracefile
COMMAND ${COVERAGE_LCOV} ${COMMON_FLAGS} --directory . --capture --output-file ${COVERAGE_DIR}/coverage-test.info
COMMAND ${COVERAGE_LCOV} ${COMMON_FLAGS} --add-tracefile ${COVERAGE_DIR}/coverage-test.info --add-tracefile
${COVERAGE_DIR}/coverage-base.info --output-file ${COVERAGE_DIR}/coverage.info
COMMAND ${COVERAGE_AWK} -f "${COVERAGE_FILTER}" ${COVERAGE_DIR}/coverage.info > ${COVERAGE_DIR}/coverage-filtered.info
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
Expand All @@ -41,8 +38,7 @@ if (EXISTS ${COVERAGE_LCOV} AND EXISTS ${COVERAGE_AWK})
if (EXISTS ${COVERAGE_GENHTML})
add_custom_target (
coverage-genhtml
COMMAND
${COVERAGE_GENHTML} ${COMMON_FLAGS} ${COVERAGE_DIR}/coverage-filtered.info --prefix "${COVERAGE_PREFIX}"
COMMAND ${COVERAGE_GENHTML} ${COMMON_FLAGS} ${COVERAGE_DIR}/coverage-filtered.info --prefix "${COVERAGE_PREFIX}"
--output-directory ${COVERAGE_DIR}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
COMMENT "Create html statistics of data for coverage.")
Expand Down
6 changes: 2 additions & 4 deletions scripts/cmake/ElektraManPage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ if (EXISTS "${MANPAGE}" AND DIFF_COMMAND)
execute_process (COMMAND ${CMAKE_COMMAND} -E copy ${MANPAGE} ${OLD_MAN_PAGE_COPY})
endif (EXISTS "${MANPAGE}" AND DIFF_COMMAND)

execute_process (
COMMAND
${CMAKE_COMMAND} -E env RUBYOPT=-Eutf-8:utf-8 LC_ALL=C.utf-8 ${RONN_COMMAND} -r --pipe ${MDFILE}
OUTPUT_FILE ${MANPAGE})
execute_process (COMMAND ${CMAKE_COMMAND} -E env RUBYOPT=-Eutf-8:utf-8 LC_ALL=C.utf-8 ${RONN_COMMAND} -r --pipe ${MDFILE}
OUTPUT_FILE ${MANPAGE})

if (NOT EXISTS "${OLD_MAN_PAGE_COPY}")
return ()
Expand Down
5 changes: 4 additions & 1 deletion scripts/cmake/Modules/FindGLib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,7 @@ if (GLib_LIBRARY AND NOT GLib_FOUND)
endif ()

include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (GLib REQUIRED_VARS GLib_LIBRARY GLib_INCLUDE_DIRS VERSION_VAR GLib_VERSION)
find_package_handle_standard_args (
GLib
REQUIRED_VARS GLib_LIBRARY GLib_INCLUDE_DIRS
VERSION_VAR GLib_VERSION)
5 changes: 4 additions & 1 deletion scripts/cmake/Modules/FindLibGit2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ if (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND)
endif (NOT LibGit2_VERSION_HEADER STREQUAL LibGit2_VERSION_HEADER-NOTFOUND)

include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (LibGit2 REQUIRED_VARS LibGit2_LIBRARIES LibGit2_INCLUDE_DIR VERSION_VAR LibGit2_VERSION)
find_package_handle_standard_args (
LibGit2
REQUIRED_VARS LibGit2_LIBRARIES LibGit2_INCLUDE_DIR
VERSION_VAR LibGit2_VERSION)

mark_as_advanced (LibGit2_INCLUDE_DIR LibGit2_LIBRARIES)

Expand Down
6 changes: 4 additions & 2 deletions scripts/cmake/Modules/FindLibOpenSSL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ endif ()
if (OPENSSL_FOUND)

# try to compile and link a minimal sample program against libcrypto
try_compile (HAS_OPENSSL_4SURE "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}/src/plugins/crypto/compile_openssl.c"
CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${OPENSSL_INCLUDE_DIR} -DLINK_LIBRARIES:PATH=${OPENSSL_LIBRARIES})
try_compile (
HAS_OPENSSL_4SURE "${CMAKE_BINARY_DIR}"
"${PROJECT_SOURCE_DIR}/src/plugins/crypto/compile_openssl.c"
CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${OPENSSL_INCLUDE_DIR} -DLINK_LIBRARIES:PATH=${OPENSSL_LIBRARIES})

if (NOT HAS_OPENSSL_4SURE)
message (STATUS "OpenSSL compile/linker test failed")
Expand Down
6 changes: 4 additions & 2 deletions scripts/cmake/Modules/FindLibgcrypt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ set (Libgcrypt_INCLUDE_DIRS ${Libgcrypt_INCLUDE_DIR})

if (Libgcrypt_FOUND)
# Try to compile and link a minimal sample program against libgcrypt
try_compile (HAS_GCRYPT_4SURE ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/src/plugins/crypto/compile_gcrypt.c
CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${Libgcrypt_INCLUDE_DIRS} -DLINK_LIBRARIES:PATH=${Libgcrypt_LIBRARIES})
try_compile (
HAS_GCRYPT_4SURE ${CMAKE_BINARY_DIR}
${PROJECT_SOURCE_DIR}/src/plugins/crypto/compile_gcrypt.c
CMAKE_FLAGS -DINCLUDE_DIRECTORIES:STRING=${Libgcrypt_INCLUDE_DIRS} -DLINK_LIBRARIES:PATH=${Libgcrypt_LIBRARIES})

if (NOT HAS_GCRYPT_4SURE)
message (STATUS "libgcrypt compile/linker test failed. Please check if all library and include paths are set properly!")
Expand Down
9 changes: 6 additions & 3 deletions scripts/cmake/Modules/FindLua.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ function (set_lua_version_vars)
foreach (ver IN LISTS lua_append_versions)
string (REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
list (APPEND _lua_include_subdirs include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2} include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2})
include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2})
list (APPEND _lua_library_names lua${CMAKE_MATCH_1}${CMAKE_MATCH_2} lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2})
lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2})
endforeach ()

set (
Expand Down Expand Up @@ -329,6 +329,9 @@ verify_lua_executable_version () # LUA_VERSION_STRING available from here
include (FindPackageHandleStandardArgs)

# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if all listed variables are TRUE
find_package_handle_standard_args (Lua REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR VERSION_VAR LUA_VERSION_STRING)
find_package_handle_standard_args (
Lua
REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
VERSION_VAR LUA_VERSION_STRING)

mark_as_advanced (LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)
5 changes: 4 additions & 1 deletion scripts/cmake/Modules/FindPython2Interp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ endif (PYTHON2_EXECUTABLE)

# handle the QUIETLY and REQUIRED arguments and set PYTHON2INTERP_FOUND to TRUE if all listed variables are TRUE
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (Python2Interp REQUIRED_VARS PYTHON2_EXECUTABLE VERSION_VAR PYTHON2_VERSION_STRING)
find_package_handle_standard_args (
Python2Interp
REQUIRED_VARS PYTHON2_EXECUTABLE
VERSION_VAR PYTHON2_VERSION_STRING)

mark_as_advanced (PYTHON2_EXECUTABLE)
5 changes: 4 additions & 1 deletion scripts/cmake/Modules/FindPython2Libs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,10 @@ select_library_configurations (PYTHON2)
unset (PYTHON2_FOUND)

include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (Python2Libs REQUIRED_VARS PYTHON2_LIBRARIES PYTHON2_INCLUDE_DIRS VERSION_VAR PYTHON2LIBS_VERSION_STRING)
find_package_handle_standard_args (
Python2Libs
REQUIRED_VARS PYTHON2_LIBRARIES PYTHON2_INCLUDE_DIRS
VERSION_VAR PYTHON2LIBS_VERSION_STRING)

# PYTHON2_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python. PYTHON2_WRITE_MODULES_HEADER(<filename>) writes a
# header file you can include in your sources to initialize the static python modules
Expand Down
24 changes: 8 additions & 16 deletions scripts/cmake/Modules/FindXercesC.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,10 @@ endif ()
include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (
XercesC
FOUND_VAR
XercesC_FOUND
REQUIRED_VARS
XercesC_LIBRARY
XercesC_INCLUDE_DIR
XercesC_VERSION
VERSION_VAR
XercesC_VERSION
FAIL_MESSAGE
"Failed to find XercesC")
FOUND_VAR XercesC_FOUND
REQUIRED_VARS XercesC_LIBRARY XercesC_INCLUDE_DIR XercesC_VERSION
VERSION_VAR XercesC_VERSION
FAIL_MESSAGE "Failed to find XercesC")

if (XercesC_FOUND)
set (XercesC_INCLUDE_DIRS "${XercesC_INCLUDE_DIR}")
Expand All @@ -135,18 +129,16 @@ if (XercesC_FOUND)
TARGET XercesC::XercesC
APPEND
PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties (
XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" IMPORTED_LOCATION_DEBUG
"${XercesC_LIBRARY_DEBUG}")
set_target_properties (XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
IMPORTED_LOCATION_DEBUG "${XercesC_LIBRARY_DEBUG}")
endif ()
if (EXISTS "${XercesC_LIBRARY_RELEASE}")
set_property (
TARGET XercesC::XercesC
APPEND
PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties (
XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" IMPORTED_LOCATION_RELEASE
"${XercesC_LIBRARY_RELEASE}")
set_target_properties (XercesC::XercesC PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
IMPORTED_LOCATION_RELEASE "${XercesC_LIBRARY_RELEASE}")
endif ()
endif ()
endif ()
5 changes: 4 additions & 1 deletion scripts/cmake/Modules/FindZeroMQ.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ if (EXISTS ${ZeroMQ_VERSION_HEADER})
endif (EXISTS ${ZeroMQ_VERSION_HEADER})

include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (ZeroMQ REQUIRED_VARS ZeroMQ_LIBRARY ZeroMQ_INCLUDE_DIR VERSION_VAR ZeroMQ_VERSION)
find_package_handle_standard_args (
ZeroMQ
REQUIRED_VARS ZeroMQ_LIBRARY ZeroMQ_INCLUDE_DIR
VERSION_VAR ZeroMQ_VERSION)

mark_as_advanced (ZeroMQ_INCLUDE_DIR ZeroMQ_LIBRARY ZeroMQ_VERSION)

Expand Down
5 changes: 4 additions & 1 deletion scripts/cmake/Modules/Findlibuv.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ if (NOT libuv_VERSION_HEADER STREQUAL libuv_VERSION_HEADER-NOTFOUND)
endif (NOT libuv_VERSION_HEADER STREQUAL libuv_VERSION_HEADER-NOTFOUND)

include (FindPackageHandleStandardArgs)
find_package_handle_standard_args (libuv REQUIRED_VARS libuv_LIBRARY libuv_INCLUDE_DIR VERSION_VAR libuv_VERSION)
find_package_handle_standard_args (
libuv
REQUIRED_VARS libuv_LIBRARY libuv_INCLUDE_DIR
VERSION_VAR libuv_VERSION)

mark_as_advanced (libuv_INCLUDE_DIR libuv_LIBRARY libuv_VERSION)

Expand Down
5 changes: 4 additions & 1 deletion scripts/cmake/Modules/Findyaml-cpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ set (yaml-cpp_VERSION ${PC_yaml-cpp_VERSION})

include (FindPackageHandleStandardArgs)
# Handle the QUIETLY and REQUIRED arguments and set yaml-cpp_FOUND to TRUE, if all listed variables are TRUE
find_package_handle_standard_args (yaml-cpp REQUIRED_VARS yaml-cpp_LIBRARY yaml-cpp_INCLUDE_DIR VERSION_VAR yaml-cpp_VERSION)
find_package_handle_standard_args (
yaml-cpp
REQUIRED_VARS yaml-cpp_LIBRARY yaml-cpp_INCLUDE_DIR
VERSION_VAR yaml-cpp_VERSION)

mark_as_advanced (yaml-cpp_INCLUDE_DIR yaml-cpp_LIBRARY yaml-cpp_VERSION)

Expand Down
20 changes: 15 additions & 5 deletions scripts/cmake/Modules/LibAddMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ macro (create_lib_symlink src dest component)
endif ()
"
COMPONENT "${component}")
endmacro (create_lib_symlink src dest component)
endmacro (
create_lib_symlink
src
dest
component)

# ~~~
# Create a symlink for man1 files at installation
Expand Down Expand Up @@ -109,7 +113,11 @@ macro (create_doc_symlink src dest component)
endif ()
"
COMPONENT "${component}")
endmacro (create_doc_symlink src dest component)
endmacro (
create_doc_symlink
src
dest
component)

# ~~~
# Make a directory
Expand Down Expand Up @@ -252,7 +260,10 @@ function (find_util util output_loc output_arg)
${output_arg}
${ARG_LOC}
PARENT_SCOPE)
endfunction (find_util util output)
endfunction (
find_util
util
output)

# ~~~
# - Adds all headerfiles of global include path to the given variable
Expand Down Expand Up @@ -634,8 +645,7 @@ function (generate_manpage NAME)
add_custom_command (
OUTPUT ${OUTFILE}
DEPENDS ${MDFILE}
COMMAND
${CMAKE_COMMAND} ARGS -D RONN_COMMAND=${RONN_LOC} -D DIFF_COMMAND=${DIFF_COMMAND} -D
COMMAND ${CMAKE_COMMAND} ARGS -D RONN_COMMAND=${RONN_LOC} -D DIFF_COMMAND=${DIFF_COMMAND} -D
MDFILE=${MDFILE} -D MANPAGE=${OUTFILE} -P ${CMAKE_SOURCE_DIR}/scripts/cmake/ElektraManPage.cmake)
add_custom_target (man-${NAME} ALL DEPENDS ${OUTFILE})
add_dependencies (man man-${NAME})
Expand Down
6 changes: 4 additions & 2 deletions src/bindings/intercept/env/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ target_link_libraries (elektraintercept-env elektra-kdb elektra-meta) # must be

set_target_properties (
elektraintercept-env
PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H" VERSION ${KDB_VERSION} SOVERSION ${SO_VERSION_GETENV} CLEAN_DIRECT_OUTPUT 1

PROPERTIES COMPILE_DEFINITIONS "HAVE_KDBCONFIG_H"
VERSION ${KDB_VERSION}
SOVERSION ${SO_VERSION_GETENV}
CLEAN_DIRECT_OUTPUT 1
LINKER_LANGUAGE CXX)

install (
Expand Down
5 changes: 4 additions & 1 deletion src/bindings/jna/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ macro (java_test_needs_plugin test plugin)
if (plugin_index GREATER -1)
java_exclude_test (${test})
endif (plugin_index GREATER -1)
endmacro (java_test_needs_plugin test plugin)
endmacro (
java_test_needs_plugin
test
plugin)

if (Java_JAVAC_EXECUTABLE)

Expand Down
9 changes: 3 additions & 6 deletions src/bindings/swig/lua/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@ else ()
else (CMAKE_VERSION VERSION_LESS 3.8)
swig_add_library (
swig-lua
LANGUAGE
lua
SOURCES
kdb.i
TYPE
MODULE)
LANGUAGE lua
SOURCES kdb.i
TYPE MODULE)
endif (CMAKE_VERSION VERSION_LESS 3.8)
swig_link_libraries (swig-lua elektra-core elektra-kdb ${LUA_LIBRARIES})
set_target_properties (swig-lua PROPERTIES OUTPUT_NAME kdb)
Expand Down
18 changes: 6 additions & 12 deletions src/bindings/swig/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,9 @@ else ()
else (CMAKE_VERSION VERSION_LESS 3.8)
swig_add_library (
swig-python
LANGUAGE
python
SOURCES
kdb.i
TYPE
MODULE)
LANGUAGE python
SOURCES kdb.i
TYPE MODULE)
endif (CMAKE_VERSION VERSION_LESS 3.8)
swig_link_libraries (swig-python elektra-core elektra-kdb ${PYTHON_LIBRARIES})
set_target_properties (_swig-python PROPERTIES OUTPUT_NAME _kdb)
Expand Down Expand Up @@ -104,12 +101,9 @@ else ()
else (CMAKE_VERSION VERSION_LESS 3.8)
swig_add_library (
swig-python-tools
LANGUAGE
python
SOURCES
tools.i
TYPE
MODULE)
LANGUAGE python
SOURCES tools.i
TYPE MODULE)
endif (CMAKE_VERSION VERSION_LESS 3.8)
swig_link_libraries (swig-python-tools elektratools ${PYTHON_LIBRARIES})
set_target_properties (_swig-python-tools PROPERTIES OUTPUT_NAME _tools)
Expand Down
18 changes: 6 additions & 12 deletions src/bindings/swig/ruby/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,9 @@ else ()
else (CMAKE_VERSION VERSION_LESS 3.8)
swig_add_library (
swig-ruby
LANGUAGE
ruby
SOURCES
kdb.i
TYPE
MODULE)
LANGUAGE ruby
SOURCES kdb.i
TYPE MODULE)
endif (CMAKE_VERSION VERSION_LESS 3.8) # set the compiler settings for the generated file (has to be done for each module
# separately)
set_source_files_properties (${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${SWIG_COMPILE_FLAGS}")
Expand All @@ -116,12 +113,9 @@ else ()
else (CMAKE_VERSION VERSION_LESS 3.8)
swig_add_library (
swig-ruby-tools
LANGUAGE
ruby
SOURCES
kdbtools.i
TYPE
MODULE)
LANGUAGE ruby
SOURCES kdbtools.i
TYPE MODULE)
endif (CMAKE_VERSION VERSION_LESS 3.8)
set_source_files_properties (${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${SWIG_COMPILE_FLAGS}")

Expand Down
3 changes: 1 addition & 2 deletions src/libs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ list (INSERT SUBDIRS 0 tools)

add_custom_command (
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/symbols.map"
COMMAND
awk 1 ${SYM_MAPS} | awk -v vfile=versions.def -f version_gen.awk > "${CMAKE_CURRENT_BINARY_DIR}/symbols.map"
COMMAND awk 1 ${SYM_MAPS} | awk -v vfile=versions.def -f version_gen.awk > "${CMAKE_CURRENT_BINARY_DIR}/symbols.map"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
DEPENDS version_gen.awk versions.def ${SYM_MAPS}
COMMENT "Creating version script"
Expand Down
Loading

0 comments on commit d285169

Please sign in to comment.