From 7a24e328e750510ac1152c8d8ab6389b4f7236cc Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Wed, 28 Jul 2021 21:30:21 +0200 Subject: [PATCH] rename libmultiarray -> libcnorxz --- src/lib/CMakeLists.txt | 54 ++++++++++++++++++++-------------------- src/tests/CMakeLists.txt | 32 ++++++++++++------------ 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 19f96df..681a337 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -2,7 +2,7 @@ execute_process ( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mk_hl_op.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) -set(libmultiarray_a_SOURCES +set(libcnorxz_a_SOURCES ${CMAKE_SOURCE_DIR}/src/lib/ranges/range_base.cc ${CMAKE_SOURCE_DIR}/src/lib/ranges/anonymous_range.cc ${CMAKE_SOURCE_DIR}/src/lib/ranges/dynamic_meta.cc @@ -12,64 +12,64 @@ set(libmultiarray_a_SOURCES ${CMAKE_SOURCE_DIR}/src/lib/map_range_factory_product_map.cc ) -set(libhlmultiarray_a_SOURCES +set(libhlcnorxz_a_SOURCES ${CMAKE_SOURCE_DIR}/src/lib/high_level_operation.cc ) -#message(WARNING ${libhlmultiarray_a_SOURCES}) +#message(WARNING ${libhlcnorxz_a_SOURCES}) file(GLOB cc_files "${CMAKE_SOURCE_DIR}/src/lib/ranges/range_types/*.cc") foreach(ccfile ${cc_files}) - set(libmultiarray_a_SOURCES ${libmultiarray_a_SOURCES} + set(libcnorxz_a_SOURCES ${libcnorxz_a_SOURCES} ${ccfile}) endforeach(ccfile) file(GLOB cc_files "${CMAKE_SOURCE_DIR}/src/lib/hl_ops/*.cc") foreach(ccfile ${cc_files}) - set(libhlmultiarray_a_SOURCES ${libhlmultiarray_a_SOURCES} + set(libhlcnorxz_a_SOURCES ${libhlcnorxz_a_SOURCES} ${ccfile}) endforeach(ccfile) -add_library(multiarray_obj OBJECT - ${libmultiarray_a_SOURCES} +add_library(cnorxz_obj OBJECT + ${libcnorxz_a_SOURCES} ) -add_library(hlmultiarray_obj OBJECT - ${libhlmultiarray_a_SOURCES} +add_library(hlcnorxz_obj OBJECT + ${libhlcnorxz_a_SOURCES} ) -set_target_properties(multiarray_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) -set_target_properties(hlmultiarray_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +set_target_properties(cnorxz_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +set_target_properties(hlcnorxz_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) -add_library(multiarray SHARED - $ +add_library(cnorxz SHARED + $ ) -set_target_properties(multiarray PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +set_target_properties(cnorxz PROPERTIES POSITION_INDEPENDENT_CODE TRUE) -add_library(multiarray_static - $ +add_library(cnorxz_static + $ ) -set_target_properties(multiarray_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +set_target_properties(cnorxz_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) -add_library(hlmultiarray SHARED - $ +add_library(hlcnorxz SHARED + $ ) -set_target_properties(hlmultiarray PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +set_target_properties(hlcnorxz PROPERTIES POSITION_INDEPENDENT_CODE TRUE) -add_library(hlmultiarray_static - $ +add_library(hlcnorxz_static + $ ) -set_target_properties(hlmultiarray_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +set_target_properties(hlcnorxz_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) -install(TARGETS multiarray +install(TARGETS cnorxz ARCHIVE DESTINATION ${INSTALL_PATH}/lib LIBRARY DESTINATION ${INSTALL_PATH}/lib) -install(TARGETS multiarray_static +install(TARGETS cnorxz_static ARCHIVE DESTINATION ${INSTALL_PATH}/lib LIBRARY DESTINATION ${INSTALL_PATH}/lib) -install(TARGETS hlmultiarray +install(TARGETS hlcnorxz ARCHIVE DESTINATION ${INSTALL_PATH}/lib LIBRARY DESTINATION ${INSTALL_PATH}/lib) -install(TARGETS hlmultiarray_static +install(TARGETS hlcnorxz_static ARCHIVE DESTINATION ${INSTALL_PATH}/lib LIBRARY DESTINATION ${INSTALL_PATH}/lib) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index fa99e9a..165a6bc 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,41 +1,41 @@ #add_executable(iutest /ranges/index_unit_test.cc ${INDEX_CC_FILES}) add_executable(iutest ranges/index_unit_test.cc) -add_dependencies(iutest multiarray) -target_link_libraries(iutest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) +add_dependencies(iutest cnorxz) +target_link_libraries(iutest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz) add_test(NAME iutest COMMAND iutest) add_executable(autest ranges/anonymous_unit_test.cc) -add_dependencies(autest multiarray) -target_link_libraries(autest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) +add_dependencies(autest cnorxz) +target_link_libraries(autest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz) add_test(NAME autest COMMAND autest) #add_executable(mautest src/tests/array_unit_test.cc ${MA_CC_FILES}) add_executable(mautest array_unit_test.cc) -add_dependencies(mautest multiarray) -target_link_libraries(mautest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) +add_dependencies(mautest cnorxz) +target_link_libraries(mautest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz) add_test(NAME mautest COMMAND mautest) add_executable(oputest op_unit_test.cc) -add_dependencies(oputest multiarray) -target_link_libraries(oputest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) +add_dependencies(oputest cnorxz) +target_link_libraries(oputest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz) add_test(NAME oputest COMMAND oputest) add_executable(op2utest op2_unit_test.cc) -add_dependencies(op2utest multiarray) -target_link_libraries(op2utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) +add_dependencies(op2utest cnorxz) +target_link_libraries(op2utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz) add_test(NAME op2utest COMMAND op2utest) add_executable(op3utest op3_unit_test.cc) -add_dependencies(op3utest multiarray) -target_link_libraries(op3utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) +add_dependencies(op3utest cnorxz) +target_link_libraries(op3utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz) add_test(NAME op3utest COMMAND op3utest) add_executable(op4utest op4_unit_test.cc) -add_dependencies(op4utest multiarray hlmultiarray) -target_link_libraries(op4utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray hlmultiarray) +add_dependencies(op4utest cnorxz hlcnorxz) +target_link_libraries(op4utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz hlcnorxz) add_test(NAME op4utest COMMAND op4utest) add_executable(opptest op_perf_test.cc) -add_dependencies(opptest multiarray) -target_link_libraries(opptest multiarray) +add_dependencies(opptest cnorxz) +target_link_libraries(opptest cnorxz)