Skip to content

Commit

Permalink
CMake: minor cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
tstenner committed Jun 26, 2018
1 parent de14518 commit 867eb55
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.5)
project(LabStreamingLayer)
project(LabStreamingLayer
VERSION 1.12.0)

# add the liblsl build directory
add_subdirectory(LSL/liblsl)
Expand All @@ -14,18 +15,9 @@ include(LSLCMake)
set(LSL_INSTALL_ROOT ${CMAKE_CURRENT_LIST_DIR} CACHE STRING
"LSL root directory, LSL_INSTALL_ROOT/cmake contains modules to set everything up / find liblsl" FORCE)

# When using a precompiled lsl, liblsl is installed as an exported target with
# an autogenerated FindLSL.cmake in LSL_INSTALL_ROOT/cmake so the apps and
# CMake scripts don't care where LSL_INSTALL_ROOT was defined

# include the Apps directory which defines options, which Apps will be built
# and includes their build configurations
add_subdirectory(Apps)

# When building the whole tree, no component specific versions can be used
# https://stackoverflow.com/q/44951598/73299
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 0)
set(CPACK_PACKAGE_VERSION_PATCH 1)
# Generate packages for LSL and all built apps
LSLGenerateCPackConfig()

0 comments on commit 867eb55

Please sign in to comment.