diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-10-03 22:32:20 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-10-03 22:32:20 +0000 |
| commit | 95cb15d62fbddb2a17358823869d9af968e57f8e (patch) | |
| tree | 0ac0c1cea7d7db2b72ae1f51cd4d4d45e08837c0 /cmake | |
| parent | 76d765783b4fa018fff7dba93639a76ca9be1a3e (diff) | |
| download | navit-95cb15d62fbddb2a17358823869d9af968e57f8e.tar.gz | |
Fix:core/cmake:Install modules to the same path as the autotools toolchain does
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3592 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/navit_macros.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake index cc8b714a8..8188aad82 100644 --- a/cmake/navit_macros.cmake +++ b/cmake/navit_macros.cmake @@ -18,7 +18,6 @@ macro(add_plugin PLUGIN_PATH) endmacro() macro(module_add_library MODULE_NAME ) -# add_definitions( -DMODULE=${MODULE_NAME} -fPIC) add_library(${MODULE_NAME} ${MODULE_BUILD_TYPE} ${ARGN}) SET_TARGET_PROPERTIES(${MODULE_NAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=${MODULE_NAME}") @@ -26,10 +25,9 @@ macro(module_add_library MODULE_NAME ) SET_TARGET_PROPERTIES( ${LIB_NAME} PROPERTIES COMPILE_FLAGS ${NAVIT_COMPILE_FLAGS}) TARGET_LINK_LIBRARIES(${MODULE_NAME} navit_core) install(TARGETS ${MODULE_NAME} - DESTINATION ${LIB_DIR}/navit + DESTINATION ${LIB_DIR}/navit/${${MODULE_NAME}_TYPE} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) endif() -# TARGET_LINK_LIBRARIES(${MODULE_NAME} ${NAVIT_SUPPORT_LIBS}) endmacro(module_add_library) macro(supportlib_add_library LIB_NAME ) @@ -38,7 +36,4 @@ macro(supportlib_add_library LIB_NAME ) SET_TARGET_PROPERTIES( ${LIB_NAME} PROPERTIES COMPILE_FLAGS ${NAVIT_COMPILE_FLAGS}) TARGET_LINK_LIBRARIES(${MODULE_NAME} navit_core) endif() -# SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=${LIB_NAME}") - -# TARGET_LINK_LIBRARIES(${LIB_NAME} ${NAVIT_SUPPORT_LIBS}) endmacro(supportlib_add_library) |