Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.
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: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 130ab3925820
Choose a base ref
...
head repository: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2684c44145ca
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 21, 2020

  1. Updated CMake project file to exclude incompatible projects on Windows

    nshcat committed Jun 21, 2020
    Copy the full SHA
    e19753e View commit details

  2. Merge pull request #15 from nshcat/win32-fixes 

    Updated CMake project file to exclude incompatible projects on Windows
    @azonenberg
    azonenberg authored Jun 21, 2020
    Copy the full SHA
    2684c44 View commit details
Showing with 13 additions and 5 deletions.
  1. +13 −5 CMakeLists.txt
18 changes: 13 additions & 5 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -16,17 +16,25 @@ pkg_check_modules(GLM glm>=0.9.8)
pkg_search_module(GLM REQUIRED glm>=0.9.8)
find_package(FFTS)

add_subdirectory("${PROJECT_SOURCE_DIR}/doc")
# Texlive does not work well in MinGW. Building docs isnt really needed on Windows right now.
# We might find a fix for this in the future.
if(NOT WIN32)
add_subdirectory("${PROJECT_SOURCE_DIR}/doc")
endif()

add_subdirectory("${PROJECT_SOURCE_DIR}/lib/graphwidget")
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/scopehal")
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/scopeprotocols")
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/xptools")
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/log")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/glscopeclient")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/psuclient")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/reflowmon")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/examples/curvetrace")
#add_subdirectory("${PROJECT_SOURCE_DIR}/src/examples/fgtest")

if(NOT WIN32)
add_subdirectory("${PROJECT_SOURCE_DIR}/src/psuclient")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/reflowmon")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/examples/curvetrace")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/examples/fgtest")
endif()

set_property(TARGET scopehal PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET log PROPERTY POSITION_INDEPENDENT_CODE ON)