diff options
| author | mvglasow <michael -at- vonglasow.com> | 2018-05-26 22:16:52 +0200 |
|---|---|---|
| committer | mvglasow <michael -at- vonglasow.com> | 2018-05-26 22:16:52 +0200 |
| commit | 5b9d018fdbcef2b9ffaf539ee0f959bd07ccf57c (patch) | |
| tree | 0ea83f5162ac7c5503f7da6f9285fda4f5d76c46 /navit/CMakeLists.txt | |
| parent | e2dd06580d1b60c5638433d8471008b29c81f674 (diff) | |
| download | navit-5b9d018fdbcef2b9ffaf539ee0f959bd07ccf57c.tar.gz | |
cleanup:global:Reformat with astyle and remove trailing spaces
Mirrors 8a76acb and 41a1264
Signed-off-by: mvglasow <michael -at- vonglasow.com>
Diffstat (limited to 'navit/CMakeLists.txt')
| -rw-r--r-- | navit/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 416a84fc1..bb07b65c3 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -30,7 +30,7 @@ endif() foreach ( PLUGIN_PATH ${ALL_PLUGINS}) if (${PLUGIN_PATH}) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_PATH}") - + string(REPLACE "/" "_" MODULE_INC ${PLUGIN_PATH}) list(APPEND NAVIT_SUPPORT_LIBS ${MODULE_INC}) endif() @@ -39,11 +39,11 @@ endforeach() foreach ( MODULE_PATH ${ALL_MODULES}) if ( ${MODULE_PATH} ) include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_PATH}") - + string(REPLACE "/" "_" MODULE_INC ${MODULE_PATH}) list(APPEND MODULES_PROTOTYPE "\nvoid\tmodule_${MODULE_INC}_init(void)") list(APPEND MODULES_FUNC "\nmodule_${MODULE_INC}_init()") - + if (NOT USE_PLUGINS) list(APPEND MODULES_NAME ${MODULE_INC}) else() @@ -103,7 +103,7 @@ endif(SHARED_LIBNAVIT) if(NOT MSVC) SET(NAVIT_LIBS ${NAVIT_LIBS} m) endif(NOT MSVC) -target_link_libraries(${NAVIT_LIBNAME} ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} ) +target_link_libraries(${NAVIT_LIBNAME} ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} ) set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=navit;LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}\";PREFIX=\"${CMAKE_INSTALL_PREFIX}\"") if (DEFINED NAVIT_COMPILE_FLAGS) set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}") @@ -191,7 +191,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/navit.xml get_directory_property(INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES) WRITE_FILE("cmake_plugin_settings.txt" - "set(APPLE ${APPLE} CACHE BOOL init)\n" + "set(APPLE ${APPLE} CACHE BOOL init)\n" "set(ANDROID ${ANDROID} CACHE BOOL init)\n" "set(USE_PLUGINS ${USE_PLUGINS} CACHE BOOL init)\n" "set(MODULE_BUILD_TYPE \"${MODULE_BUILD_TYPE}\" CACHE STRING init)\n" |