diff --git a/software/.gitignore b/software/.gitignore index 378eac2..7273050 100644 --- a/software/.gitignore +++ b/software/.gitignore @@ -1 +1,4 @@ build +cmake-build-debug +cmake-build-release +bin \ No newline at end of file diff --git a/software/CMakeLists.txt b/software/CMakeLists.txt index ae9bf68..5c4bd50 100644 --- a/software/CMakeLists.txt +++ b/software/CMakeLists.txt @@ -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) diff --git a/software/drscl/CMakeLists.txt b/software/drscl/CMakeLists.txt index 0861b94..bb32dce 100644 --- a/software/drscl/CMakeLists.txt +++ b/software/drscl/CMakeLists.txt @@ -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) diff --git a/software/drsosc/CMakeLists.txt b/software/drsosc/CMakeLists.txt index adc9f72..d8fbeca 100644 --- a/software/drsosc/CMakeLists.txt +++ b/software/drsosc/CMakeLists.txt @@ -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)