chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename libmultiarray -> libcnorxz

Browse source
This commit is contained in:
Christian Zimmermann 2021-07-28 21:30:21 +02:00
parent 3975edea20
commit 7a24e328e7
2 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/lib/CMakeLists.txt
View file

@ -2,7 +2,7 @@
execute_process ( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mk_hl_op.sh execute_process ( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mk_hl_op.sh
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ ) 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/range_base.cc
${CMAKE_SOURCE_DIR}/src/lib/ranges/anonymous_range.cc ${CMAKE_SOURCE_DIR}/src/lib/ranges/anonymous_range.cc
${CMAKE_SOURCE_DIR}/src/lib/ranges/dynamic_meta.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 ${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 ${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") file(GLOB cc_files "${CMAKE_SOURCE_DIR}/src/lib/ranges/range_types/*.cc")
foreach(ccfile ${cc_files}) foreach(ccfile ${cc_files})
set(libmultiarray_a_SOURCES ${libmultiarray_a_SOURCES} set(libcnorxz_a_SOURCES ${libcnorxz_a_SOURCES}
${ccfile}) ${ccfile})
endforeach(ccfile) endforeach(ccfile)
file(GLOB cc_files "${CMAKE_SOURCE_DIR}/src/lib/hl_ops/*.cc") file(GLOB cc_files "${CMAKE_SOURCE_DIR}/src/lib/hl_ops/*.cc")
foreach(ccfile ${cc_files}) foreach(ccfile ${cc_files})
set(libhlmultiarray_a_SOURCES ${libhlmultiarray_a_SOURCES} set(libhlcnorxz_a_SOURCES ${libhlcnorxz_a_SOURCES}
${ccfile}) ${ccfile})
endforeach(ccfile) endforeach(ccfile)
add_library(multiarray_obj OBJECT add_library(cnorxz_obj OBJECT
${libmultiarray_a_SOURCES} ${libcnorxz_a_SOURCES}
) )
add_library(hlmultiarray_obj OBJECT add_library(hlcnorxz_obj OBJECT
${libhlmultiarray_a_SOURCES} ${libhlcnorxz_a_SOURCES}
) )
set_target_properties(multiarray_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) set_target_properties(cnorxz_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
set_target_properties(hlmultiarray_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE) set_target_properties(hlcnorxz_obj PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
add_library(multiarray SHARED add_library(cnorxz SHARED
$<TARGET_OBJECTS:multiarray_obj> $<TARGET_OBJECTS:cnorxz_obj>
) )
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
$<TARGET_OBJECTS:multiarray_obj> $<TARGET_OBJECTS:cnorxz_obj>
) )
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
$<TARGET_OBJECTS:hlmultiarray_obj> $<TARGET_OBJECTS:hlcnorxz_obj>
) )
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
$<TARGET_OBJECTS:hlmultiarray_obj> $<TARGET_OBJECTS:hlcnorxz_obj>
) )
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 ARCHIVE DESTINATION ${INSTALL_PATH}/lib
LIBRARY DESTINATION ${INSTALL_PATH}/lib) LIBRARY DESTINATION ${INSTALL_PATH}/lib)
install(TARGETS multiarray_static install(TARGETS cnorxz_static
ARCHIVE DESTINATION ${INSTALL_PATH}/lib ARCHIVE DESTINATION ${INSTALL_PATH}/lib
LIBRARY DESTINATION ${INSTALL_PATH}/lib) LIBRARY DESTINATION ${INSTALL_PATH}/lib)
install(TARGETS hlmultiarray install(TARGETS hlcnorxz
ARCHIVE DESTINATION ${INSTALL_PATH}/lib ARCHIVE DESTINATION ${INSTALL_PATH}/lib
LIBRARY DESTINATION ${INSTALL_PATH}/lib) LIBRARY DESTINATION ${INSTALL_PATH}/lib)
install(TARGETS hlmultiarray_static install(TARGETS hlcnorxz_static
ARCHIVE DESTINATION ${INSTALL_PATH}/lib ARCHIVE DESTINATION ${INSTALL_PATH}/lib
LIBRARY DESTINATION ${INSTALL_PATH}/lib) LIBRARY DESTINATION ${INSTALL_PATH}/lib)

32
src/tests/CMakeLists.txt
View file

@ -1,41 +1,41 @@
#add_executable(iutest /ranges/index_unit_test.cc ${INDEX_CC_FILES}) #add_executable(iutest /ranges/index_unit_test.cc ${INDEX_CC_FILES})
add_executable(iutest ranges/index_unit_test.cc) add_executable(iutest ranges/index_unit_test.cc)
add_dependencies(iutest multiarray) add_dependencies(iutest cnorxz)
target_link_libraries(iutest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) target_link_libraries(iutest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz)
add_test(NAME iutest COMMAND iutest) add_test(NAME iutest COMMAND iutest)
add_executable(autest ranges/anonymous_unit_test.cc) add_executable(autest ranges/anonymous_unit_test.cc)
add_dependencies(autest multiarray) add_dependencies(autest cnorxz)
target_link_libraries(autest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) target_link_libraries(autest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz)
add_test(NAME autest COMMAND autest) add_test(NAME autest COMMAND autest)
#add_executable(mautest src/tests/array_unit_test.cc ${MA_CC_FILES}) #add_executable(mautest src/tests/array_unit_test.cc ${MA_CC_FILES})
add_executable(mautest array_unit_test.cc) add_executable(mautest array_unit_test.cc)
add_dependencies(mautest multiarray) add_dependencies(mautest cnorxz)
target_link_libraries(mautest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) target_link_libraries(mautest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz)
add_test(NAME mautest COMMAND mautest) add_test(NAME mautest COMMAND mautest)
add_executable(oputest op_unit_test.cc) add_executable(oputest op_unit_test.cc)
add_dependencies(oputest multiarray) add_dependencies(oputest cnorxz)
target_link_libraries(oputest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) target_link_libraries(oputest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz)
add_test(NAME oputest COMMAND oputest) add_test(NAME oputest COMMAND oputest)
add_executable(op2utest op2_unit_test.cc) add_executable(op2utest op2_unit_test.cc)
add_dependencies(op2utest multiarray) add_dependencies(op2utest cnorxz)
target_link_libraries(op2utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) target_link_libraries(op2utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz)
add_test(NAME op2utest COMMAND op2utest) add_test(NAME op2utest COMMAND op2utest)
add_executable(op3utest op3_unit_test.cc) add_executable(op3utest op3_unit_test.cc)
add_dependencies(op3utest multiarray) add_dependencies(op3utest cnorxz)
target_link_libraries(op3utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray) target_link_libraries(op3utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz)
add_test(NAME op3utest COMMAND op3utest) add_test(NAME op3utest COMMAND op3utest)
add_executable(op4utest op4_unit_test.cc) add_executable(op4utest op4_unit_test.cc)
add_dependencies(op4utest multiarray hlmultiarray) add_dependencies(op4utest cnorxz hlcnorxz)
target_link_libraries(op4utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} multiarray hlmultiarray) target_link_libraries(op4utest ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cnorxz hlcnorxz)
add_test(NAME op4utest COMMAND op4utest) add_test(NAME op4utest COMMAND op4utest)
add_executable(opptest op_perf_test.cc) add_executable(opptest op_perf_test.cc)
add_dependencies(opptest multiarray) add_dependencies(opptest cnorxz)
target_link_libraries(opptest multiarray) target_link_libraries(opptest cnorxz)