Skip to content

Commit

Permalink
bugfix: the rtmidi hack had broken the unix build - reverting
Browse files Browse the repository at this point in the history
  • Loading branch information
benswift committed Jan 15, 2020
1 parent 3bc765c commit d46f4ac
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Expand Up @@ -668,9 +668,7 @@ if(UNIX)
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_C_FLAGS=${EXT_DEPS_C_FLAGS}
-DCMAKE_CXX_FLAGS=${EXT_DEPS_CXX_FLAGS}
-DCMAKE_INSTALL_PREFIX=${EXT_DEPS_INSTALL_DIR}
-DCMAKE_INSTALL_LIBDIR=${EXT_DEPS_INSTALL_DIR}
-DCMAKE_INSTALL_BINDIR=${EXT_DEPS_INSTALL_DIR})
-DCMAKE_INSTALL_PREFIX=${EXT_DEPS_INSTALL_DIR})
set_target_properties(rtmidi PROPERTIES FOLDER EXTERNAL_SHLIBS)

ExternalProject_Add(kiss_fft
Expand Down Expand Up @@ -839,6 +837,7 @@ if(WIN32)
-DCMAKE_C_FLAGS=${EXT_DEPS_C_FLAGS}
-DCMAKE_CXX_FLAGS=${EXT_DEPS_CXX_FLAGS}
-DCMAKE_INSTALL_PREFIX=${EXT_DEPS_INSTALL_DIR}
# these are necessary because RTMidi's CMake config is a law unto itself
-DCMAKE_INSTALL_LIBDIR=${EXT_DEPS_INSTALL_DIR}
-DCMAKE_INSTALL_BINDIR=${EXT_DEPS_INSTALL_DIR})
set_target_properties(rtmidi PROPERTIES FOLDER EXTERNAL_SHLIBS)
Expand Down

0 comments on commit d46f4ac

Please sign in to comment.