diff --git a/.devcontainer b/.devcontainer index a78864a..a98fa00 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit a78864a0e01bc872c8c04eed494211e5d23acce7 +Subproject commit a98fa00bf7ceecbc52d54b7fa9670795298ac7ac diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 8258273..4026f77 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -14,16 +14,16 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@26.01 + uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.1 secrets: automation_token: ${{ secrets.GHCR_TOKEN }} with: buildpro_images: '["rocky8-gcc9","rocky9-gcc13","rocky10-gcc15","ubuntu"]' macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@26.01 + uses: externpro/externpro/.github/workflows/build-macos.yml@26.01.1 secrets: inherit with: {} windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@26.01 + uses: externpro/externpro/.github/workflows/build-windows.yml@26.01.1 secrets: inherit with: {} diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index ec3fedb..ec3022d 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -34,7 +34,7 @@ jobs: # Upload build artifacts as release assets release-from-build: if: github.event_name == 'workflow_dispatch' - uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01 + uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01.1 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} permissions: diff --git a/.github/workflows/xptag.yml b/.github/workflows/xptag.yml index cd59ea3..2946213 100644 --- a/.github/workflows/xptag.yml +++ b/.github/workflows/xptag.yml @@ -8,7 +8,7 @@ on: jobs: tag: if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }} - uses: externpro/externpro/.github/workflows/tag-release.yml@26.01 + uses: externpro/externpro/.github/workflows/tag-release.yml@26.01.1 with: merge_sha: ${{ github.event.pull_request.merge_commit_sha }} pr_number: ${{ github.event.pull_request.number }} diff --git a/init/pros b/init/pros index fbd68d2..24b33a4 100644 --- a/init/pros +++ b/init/pros @@ -47,6 +47,7 @@ REPOS=" ${GITHUB}/externpro/nodeng ${GITHUB}/externpro/nodexp ${GITHUB}/externpro/nvJPEG2000 + ${GITHUB}/externpro/OpenGL ${GITHUB}/externpro/openh264 ${GITHUB}/externpro/openssl ${GITHUB}/externpro/patch diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 95dee95..9dfb867 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -10,7 +10,6 @@ if(XVFB_RUN_EXEC) set(xvfb_cmd ${XVFB_RUN_EXEC}) endif() # NOTE: set ${pro}_libs if ${PRJ}_LIBRARIES isn't sufficient -set(googletest_libs xpro::gtest_main) set(boost_libs Boost::filesystem Boost::program_options Boost::regex) set(boost_compile_definitions "BOOST_NO_CXX98_FUNCTION_BASE") set(hdf5_libs xpro::hdf5_cpp-static) @@ -60,16 +59,16 @@ foreach(pro ${pros}) list(APPEND all_srcs "${pro}.cpp") string(TOUPPER ${pro} PRJ) if(DEFINED ${pro}_libs) - target_link_libraries(${pro}_test PRIVATE ${${pro}_libs} xpro::gtest_main) + target_link_libraries(${pro}_test PRIVATE ${${pro}_libs} googletest) list(APPEND all_libs ${${pro}_libs}) elseif(TARGET ${pro}) - target_link_libraries(${pro}_test PRIVATE ${pro} xpro::gtest_main) + target_link_libraries(${pro}_test PRIVATE ${pro} googletest) list(APPEND all_libs ${pro}) elseif(TARGET ${pro}::${pro}) - target_link_libraries(${pro}_test PRIVATE ${pro}::${pro} xpro::gtest_main) + target_link_libraries(${pro}_test PRIVATE ${pro}::${pro} googletest) list(APPEND all_libs ${pro}::${pro}) elseif(DEFINED ${PRJ}_LIBRARIES) - target_link_libraries(${pro}_test PRIVATE ${${PRJ}_LIBRARIES} xpro::gtest_main) + target_link_libraries(${pro}_test PRIVATE ${${PRJ}_LIBRARIES} googletest) list(APPEND all_libs ${${PRJ}_LIBRARIES}) endif() if(DEFINED ${pro}_compile_features) diff --git a/test/boost/CMakeLists.txt b/test/boost/CMakeLists.txt index 6547fe8..921c1d2 100644 --- a/test/boost/CMakeLists.txt +++ b/test/boost/CMakeLists.txt @@ -1,3 +1,3 @@ add_executable(boost_iostreams_test iostreams.cpp) -target_link_libraries(boost_iostreams_test PRIVATE Boost::filesystem Boost::iostreams xpro::gtest_main) +target_link_libraries(boost_iostreams_test PRIVATE Boost::filesystem Boost::iostreams googletest) add_test(NAME boost_iostreams_test COMMAND boost_iostreams_test) diff --git a/test/flatbuffers/CMakeLists.txt b/test/flatbuffers/CMakeLists.txt index a66069b..7305b0b 100644 --- a/test/flatbuffers/CMakeLists.txt +++ b/test/flatbuffers/CMakeLists.txt @@ -12,6 +12,6 @@ elseif(TARGET flatbuffers::flatbuffers) set(fb flatbuffers::flatbuffers) endif() xpFlatBuffersBuild(TARGET ${tgt} SCHEMAS ${fbs_srcs}) -target_link_libraries(${tgt} PRIVATE ${fb} xpro::gtest_main) +target_link_libraries(${tgt} PRIVATE ${fb} googletest) target_compile_features(${tgt} PRIVATE ${${pro}_compile_features}) add_test(NAME ${tgt} COMMAND ${tgt}) diff --git a/test/node-addon-api/CMakeLists.txt b/test/node-addon-api/CMakeLists.txt index 6dc81d0..9d8f448 100644 --- a/test/node-addon-api/CMakeLists.txt +++ b/test/node-addon-api/CMakeLists.txt @@ -1,7 +1,7 @@ set(pro node-addon-api) set(tgt ${pro}_test) add_library(${tgt} SHARED ${pro}.cpp) -target_link_libraries(${tgt} PRIVATE xpro::node-addon-api xpro::gtest_main) +target_link_libraries(${tgt} PRIVATE xpro::node-addon-api googletest) set_target_properties(${tgt} PROPERTIES OUTPUT_NAME "${tgt}" PREFIX "" SUFFIX ".node") if(APPLE) target_link_options(${tgt} PUBLIC -undefined dynamic_lookup) diff --git a/test/nodexp/CMakeLists.txt b/test/nodexp/CMakeLists.txt index 6e9f746..a6fa8c5 100644 --- a/test/nodexp/CMakeLists.txt +++ b/test/nodexp/CMakeLists.txt @@ -1,7 +1,7 @@ set(pro nodexp) set(tgt ${pro}_test) add_library(${tgt} SHARED ${pro}.cpp) -target_link_libraries(${tgt} PRIVATE xpro::node xpro::gtest_main) +target_link_libraries(${tgt} PRIVATE xpro::node googletest) set_target_properties(${tgt} PROPERTIES OUTPUT_NAME "${tgt}" PREFIX "" SUFFIX ".node") if(APPLE) target_link_options(${tgt} PUBLIC -undefined dynamic_lookup) diff --git a/test/nvJPEG2000/CMakeLists.txt b/test/nvJPEG2000/CMakeLists.txt index b815b04..127965d 100644 --- a/test/nvJPEG2000/CMakeLists.txt +++ b/test/nvJPEG2000/CMakeLists.txt @@ -9,6 +9,6 @@ configure_file(nvjpeg2000.in.cpp nvjpeg2000.cpp @ONLY) # nvjpeg2000 is not available on macOS if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") add_executable(${pro}_test ${CMAKE_CURRENT_BINARY_DIR}/nvjpeg2000.cpp) - target_link_libraries(${pro}_test PRIVATE ${NVJPEG2000_LIBRARIES} xpro::gtest_main) + target_link_libraries(${pro}_test PRIVATE ${NVJPEG2000_LIBRARIES} googletest) add_test(NAME ${pro}_test COMMAND ${pro}_test) endif() diff --git a/test/protobuf/CMakeLists.txt b/test/protobuf/CMakeLists.txt index efe74c3..fe38fb3 100644 --- a/test/protobuf/CMakeLists.txt +++ b/test/protobuf/CMakeLists.txt @@ -5,5 +5,5 @@ add_executable(${tgt} person.cpp ${pro}.cpp) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${proto_srcs}) target_sources(${tgt} PRIVATE ${PROTO_SRCS} ${PROTO_HDRS}) target_include_directories(${tgt} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries(${tgt} PRIVATE xpro::libprotobuf xpro::gtest_main) +target_link_libraries(${tgt} PRIVATE xpro::libprotobuf googletest) add_test(NAME ${tgt} COMMAND ${tgt}) diff --git a/test/wxInclude/CMakeLists.txt b/test/wxInclude/CMakeLists.txt index 8b5e273..6a953ad 100644 --- a/test/wxInclude/CMakeLists.txt +++ b/test/wxInclude/CMakeLists.txt @@ -11,5 +11,5 @@ xpCreateHeaderResource(hrcList ${depsSvg} ${graphPng}) add_executable(${tgt} hrc.cpp ${hrcList}) target_include_directories(${tgt} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_compile_definitions(${tgt} PRIVATE DEPS_SVG_PATH="${depsSvg}" GRAPH_PNG_PATH="${graphPng}") -target_link_libraries(${tgt} PRIVATE xpro::gtest_main) +target_link_libraries(${tgt} PRIVATE googletest) add_test(NAME ${tgt} COMMAND ${tgt})