Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53b56dbeb0fd
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5ff91a7b734d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 24, 2020

  1. glscopeclient's CMake now copies resources to the build directory

    @antikerneldev
    antikerneldev committed Feb 24, 2020
    Copy the full SHA
    3aed00b View commit details

  2. Merge branch 'tmp_cmake'

    @antikerneldev
    antikerneldev committed Feb 24, 2020
    Copy the full SHA
    5ff91a7 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 glscopeclient/CMakeLists.txt
9 changes: 9 additions & 0 deletions glscopeclient/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -39,3 +39,12 @@ target_link_libraries(glscopeclient
GL
)

###############################################################################
#Copy the resources to the build directory

add_custom_command(TARGET glscopeclient COMMENT "Copying gradients..." POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/gradients ${CMAKE_BINARY_DIR}/src/glscopeclient/gradients)

add_custom_command(TARGET glscopeclient COMMENT "Copying shaders..." POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/shaders ${CMAKE_BINARY_DIR}/src/glscopeclient/shaders)

add_custom_command(TARGET glscopeclient COMMENT "Copying styles..." POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/glscopeclient/styles ${CMAKE_BINARY_DIR}/src/glscopeclient/styles)