Skip to content

Commit

Permalink
Fixed KOBO_EXTRA_LIBRARIES default value
Browse files Browse the repository at this point in the history
The KOBO_EXTRA_LIBRARIES CMake variable used to be defined via option(),
which meant it was really a boolean, and any non-true default would
automatically be converted to "OFF".

Now using set() with a help string instead, and a proper "" default.

Closes #454.
  • Loading branch information
olofson committed Aug 3, 2017
1 parent b9364c5 commit de149a4
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ option(DEMO_BUILD "Build Kobo Redux demo." OFF)
option(WIN32_ZIP_BUILD "Build flat Win32 ZIP archive." OFF)
option(WORKDIR "Top level build/staging directory."
"${KOBOREDUX_SOURCE_DIR}/build")
option(KOBO_EXTRA_LIBRARIES "Extra libraries to link with." "")
set(KOBO_EXTRA_LIBRARIES "" CACHE STRING "Extra libraries to link with.")

message(".-----------------------------------------")
message("| DEMO_BUILD: ${DEMO_BUILD}")
message("| WIN32_ZIP_BUILD: ${WIN32_ZIP_BUILD}")
message("| WORKDIR: ${WORKDIR}")
message("| DEMO_BUILD: ${DEMO_BUILD}")
message("| WIN32_ZIP_BUILD: ${WIN32_ZIP_BUILD}")
message("| WORKDIR: ${WORKDIR}")
message("| KOBO_EXTRA_LIBRARIES: ${KOBO_EXTRA_LIBRARIES}")
message("'-----------------------------------------")

if(DEMO_BUILD)
Expand Down

0 comments on commit de149a4

Please sign in to comment.