X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=CMakeLists.txt;h=576325cf3d50b335633dbf1c5fec72a323fef574;hp=ef993e9f2f5b79b737a9e95f32c210ff4ec0b703;hb=23f8d538e91355cecfc96636f16597a2a48649ac;hpb=e08f7cf02151389d0b871029ba0fba177157bb8d diff --git a/CMakeLists.txt b/CMakeLists.txt index ef993e9..576325c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,8 +117,8 @@ SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR}/source) FOREACH(subdir ${SUBDIRS}) message(STATUS "Processing library at: source/${subdir}") file(GLOB_RECURSE SRCS source/${subdir}/*.cpp) - add_library(${subdir}_static STATIC ${SRCS}) - add_library(${subdir}_shared SHARED ${SRCS}) + add_library(anna_${subdir}_static STATIC ${SRCS}) + add_library(anna_${subdir}_shared SHARED ${SRCS}) ENDFOREACH() # @@ -131,20 +131,15 @@ FOREACH(procedure ${DYNAMIC_PROCEDURES}) message(STATUS "Processing dynamic library at: dynamic/launcher/${rel}") file(GLOB_RECURSE SRCS dynamic/launcher/${rel}/*.cpp) - add_library(launcher_procedure_${libpath}_shared SHARED ${SRCS}) + add_library(anna_launcher_procedure_${libpath}_shared SHARED ${SRCS}) set(target_dirname build/${CMAKE_BUILD_TYPE}/lib/dynamic/launcher/${rel}) - set(target_basename launcher_procedure_${libpath}_shared) + set(target_basename anna_launcher_procedure_${libpath}_shared) set_target_properties(${target_basename} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${target_dirname}) #file(RENAME ${target_dirname}/lib${target_basename}.so ${target_dirname}/libprocedure.so) ENDFOREACH() -# Linking example: -#file(GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR}/example/core/genLogon/*.cpp) -#add_executable(genLogon ${SRCS}) -#target_link_libraries(genLogon core_static app_static core_static test_static xml_static io_static crypto xml2 rt) - # Generalization: # SUBDIRLIST(MODULES ${CMAKE_CURRENT_SOURCE_DIR}/example) @@ -157,7 +152,7 @@ FOREACH(module ${MODULES}) file(GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR}/example/${module}/${subdir}/*.cpp) # Executable - set(target "${module}_${subdir}") + set(target "anna_${module}_${subdir}") add_executable(${target} "${SRCS}") set_target_properties(${target} PROPERTIES LINKER_LANGUAGE CXX) set(libraries_file "${CMAKE_CURRENT_SOURCE_DIR}/example/${module}/${subdir}/libraries.txt") @@ -201,7 +196,7 @@ FOREACH(module ${MODULES}) file(GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR}/test/${module}/*.cpp) # Executable - set(target "test_${module}") + set(target "anna_test_${module}") add_executable(${target} "${SRCS}") target_link_libraries(${target} ${GTEST_BOTH_LIBRARIES} pthread) set(libraries_file "${CMAKE_CURRENT_SOURCE_DIR}/test/${module}/libraries.txt")