WaveDAQ/drs4eb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed install dir

Browse Source
This commit is contained in:
ritt
2019-06-20 18:05:10 +02:00
parent 235024cf76
commit 6b7f0c83ef
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
software/.gitignore
+3
View File
@@ -1 +1,4 @@
build
cmake-build-debug
cmake-build-release
bin
software/CMakeLists.txt
+3
View File
@@ -1,4 +1,7 @@
cmake_minimum_required(VERSION 3.0)
set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR})
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
add_subdirectory(drscl)
add_subdirectory(drsosc)
software/drscl/CMakeLists.txt
-3
View File
@@ -1,8 +1,5 @@
cmake_minimum_required(VERSION 3.0)
set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR})
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mxml)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
find_package(libusb-1.0 REQUIRED)
software/drsosc/CMakeLists.txt
-5
View File
@@ -1,14 +1,9 @@
cmake_minimum_required(VERSION 3.0)
set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR})
message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
execute_process(COMMAND wx-config --cxxflags OUTPUT_VARIABLE WX_CXXFLAGS)
separate_arguments(WX_CXXFLAGS UNIX_COMMAND ${WX_CXXFLAGS})
execute_process(COMMAND wx-config --libs OUTPUT_VARIABLE WX_LIBS)
string(STRIP ${WX_LIBS} WX_LIBS)
message(STATUS "--cxxflags: " ${WX_CXXFLAGS})
message(STATUS "--libs: " ${WX_LIBS})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
find_package(libusb-1.0 REQUIRED)