diff --git a/Tools/CMake/basics.cmake b/Tools/CMake/basics.cmake index ef6de9bea..83e9e1952 100644 --- a/Tools/CMake/basics.cmake +++ b/Tools/CMake/basics.cmake @@ -496,26 +496,3 @@ if(MSVC) SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${projectOutDir}") ENDFOREACH() endif() - -############################################################################### -# Properties folder -############################################################################### -# we only need to add libs that we add via add_subdirectory command, basics.cmake -# will take care of the other source libs added via addLib - -if(TORQUE_SFX_OPENAL AND WIN32) - set_target_properties(OpenAL PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) - #why is openal adding these two? - set_target_properties(common PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) - set_target_properties(ex-common PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) -endif() - -if(TORQUE_SDL) - # Apple config has slightly different target names - if (APPLE) - set_target_properties(SDL2main PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) - set_target_properties(SDL2-static PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) - else() - set_target_properties(SDL2 PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) - endif() -endif() \ No newline at end of file diff --git a/Tools/CMake/torque3d.cmake b/Tools/CMake/torque3d.cmake index e49ccefe0..76c2af805 100644 --- a/Tools/CMake/torque3d.cmake +++ b/Tools/CMake/torque3d.cmake @@ -979,3 +979,26 @@ if(TORQUE_TEMPLATE) INSTALL(FILES "${CMAKE_SOURCE_DIR}/Templates/${TORQUE_TEMPLATE}/DeletePrefs.bat" DESTINATION "${TORQUE_APP_DIR}") endif() endif() + +############################################################################### +# Properties folder +############################################################################### +# we only need to add libs that we add via add_subdirectory command, basics.cmake +# will take care of the other source libs added via addLib + +if(TORQUE_SFX_OPENAL AND WIN32) + set_target_properties(OpenAL PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) + #why is openal adding these two? + set_target_properties(common PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) + set_target_properties(ex-common PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) +endif() + +if(TORQUE_SDL) + # Apple config has slightly different target names + if (APPLE) + set_target_properties(SDL2main PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) + set_target_properties(SDL2-static PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) + else() + set_target_properties(SDL2 PROPERTIES FOLDER ${TORQUE_LIBS_FOLDER_NAME}) + endif() +endif() \ No newline at end of file