Skip to content

Commit

Permalink
Fixing cmake config and desktop file
Browse files Browse the repository at this point in the history
  • Loading branch information
crapp committed May 1, 2017
1 parent 4046f30 commit f58b139
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
9 changes: 4 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
project(labpowerqt VERSION 0.1.3)

option(EALOGGER_EXTERNAL "Download and build ealogger" ON)
option(SANITIZER "Use AddressSanitizer (ASan) compiler flags" OFF)

# 3.1.3 provides an easy way to build with qt5 and to set properties for targets
# 3.4 is needed to export symbols on windows (needed by ealogger)
if(EALOGGER_EXTERNAL)
cmake_minimum_required(VERSION 3.4 FATAL_ERROR) # this version knows of MSVC 14
else
cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR) # this version knows of MSVC 14
cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
else()
cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR)
endif()

project(labpowerqt VERSION 0.1.3)

add_subdirectory(forms)
add_subdirectory(external/qcustomplot)
Expand Down
3 changes: 2 additions & 1 deletion resources/labpowerqt.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ Encoding=UTF-8
Name=LabPowerQt
Comment=Application to control laboratory power supplies
Exec=labpowerqt
Icon=labpowerqt.png
Icon=labpowerqt
Categories=Qt;Electronics
Terminal=false
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ if(EALOGGER_EXTERNAL)
# get the install dir
ExternalProject_Get_Property(ealogger_external install_dir)
set(EALOGGER_LIB
"${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}ealogger\
${CMAKE_STATIC_LIBRARY_SUFFIX}"
"${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}ealogger${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
include_directories(
"${install_dir}/include"
Expand Down

0 comments on commit f58b139

Please sign in to comment.