Home Explore Help
Sign In
cpp
/
panda3d
mirror of https://github.com/panda3d/panda3d
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

CMake: Correct order for {opus,vorbis}file libs

Sam Edwards 7 years ago
parent
0ff6787c1c
commit
2298aba578
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      cmake/modules/FindOpusFile.cmake
  2. 1 1
      cmake/modules/FindVorbisFile.cmake

+ 1 - 1
cmake/modules/FindOpusFile.cmake
View File 

@@ -26,7 +26,7 @@ set(OPUSFILE_INCLUDE_DIRS ${OPUS_INCLUDE_DIR} "${OPUS_INCLUDE_DIR}/opus")
 
 if(NOT OGG_INCLUDE_DIR STREQUAL OPUS_INCLUDE_DIR)
 
   list(APPEND OPUSFILE_INCLUDE_DIRS ${OGG_INCLUDE_DIR})
 
 endif()
 
-set(OPUSFILE_LIBRARIES ${OGG_LIBRARY} ${OPUS_opus_LIBRARY} ${OPUS_opusfile_LIBRARY})
 
+set(OPUSFILE_LIBRARIES ${OPUS_opusfile_LIBRARY} ${OPUS_opus_LIBRARY} ${OGG_LIBRARY})
 
 
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(OpusFile DEFAULT_MSG

+ 1 - 1
cmake/modules/FindVorbisFile.cmake
View File 

@@ -26,7 +26,7 @@ set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIR})
 
 if(NOT OGG_INCLUDE_DIR STREQUAL VORBIS_INCLUDE_DIR)
 
   list(APPEND VORBISFILE_INCLUDE_DIRS ${OGG_INCLUDE_DIR})
 
 endif()
 
-set(VORBISFILE_LIBRARIES ${OGG_LIBRARY} ${VORBIS_vorbis_LIBRARY} ${VORBIS_vorbisfile_LIBRARY})
 
+set(VORBISFILE_LIBRARIES ${VORBIS_vorbisfile_LIBRARY} ${VORBIS_vorbis_LIBRARY} ${OGG_LIBRARY})
 
 
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(VorbisFile DEFAULT_MSG